Eliminate use of the ?t macro

15 files changed, 105 insertions, 106 deletions

diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 330e2a183f..4b46957ff0 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -101,7 +101,7 @@ 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).
@@ -115,7 +115,7 @@ end_per_testcase(Config) ->
 
 set_path(Config) when is_list(Config) ->
     P = code:get_path(),
-    NonExDir = filename:join(proplists:get_value(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),
@@ -433,7 +433,7 @@ is_loaded(Config) when is_list(Config) ->
     ok.
 
 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.
@@ -561,7 +561,7 @@ set_path_file(Config) when is_list(Config) ->
 %% 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(proplists:get_value(priv_dir, Config), sticky_dir),
     _ = file:make_dir(OutDir),
@@ -574,7 +574,7 @@ sticky_dir(Config) when is_list(Config) ->
 	    io:format("~p\n", [Other]),
 	    ct:fail(failed)
     end,
-    ?t:stop_node(Node),
+    test_server:stop_node(Node),
     ok.
 
 sticky_compiler(Files, PrivDir) ->
@@ -604,22 +604,22 @@ pa_pz_option(Config) when is_list(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_path, del_path should not cause priv_dir(App) to fail.
 add_del_path(Config) when is_list(Config) ->
@@ -915,7 +915,7 @@ 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}]),
 
     Path0 = rpc:call(Node, code, get_path, []),
@@ -963,19 +963,18 @@ mult_lib_remove_prefix([$/|T], []) -> T.
 
 bad_erl_libs(Config) when is_list(Config) ->
     {ok,Node} =
-	?t:start_node(bad_erl_libs, slave, []),
+	test_server:start_node(bad_erl_libs, slave, []),
     Code = rpc:call(Node,code,get_path,[]),
-    ?t:stop_node(Node),
+    test_server:stop_node(Node),
 
     {ok,Node2} =
-	?t:start_node(bad_erl_libs, 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,[]),
-    ?t:stop_node(Node2),
+    test_server:stop_node(Node2),
 
     %% Test that code path is not affected by the faulty ERL_LIBS
     Code == Code2,
-
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1026,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"]),
@@ -1057,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) ->
@@ -1088,7 +1087,7 @@ compile_files([], _, _) ->
 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} <-
@@ -1466,7 +1465,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/disk_log_SUITE.erl b/lib/kernel/test/disk_log_SUITE.erl
index 4c5b461a3b..b570ded3cc 100644
--- a/lib/kernel/test/disk_log_SUITE.erl
+++ b/lib/kernel/test/disk_log_SUITE.erl
@@ -4987,10 +4987,10 @@ 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).
+    test_server:stop_node(Node).
 
 %from(H, [H | T]) -> T;
 %from(H, [_ | T]) -> from(H, T);
diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index ebbcdcbaf2..0b09118161 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -1168,20 +1168,20 @@ 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}]).
+    test_server:start_node(Name, slave, [{args, NewParam}]).
 %    M = list_to_atom(from($@, atom_to_list(node()))),
 %    slave:start_link(M, Name, Param).
 
@@ -1189,7 +1189,7 @@ start_node(Name) ->
     start_node(Name, "").
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 %    erlang:monitor_node(Node, true),
 %    rpc:cast(Node, init, stop, []),
 %    receive
diff --git a/lib/kernel/test/erl_distribution_wb_SUITE.erl b/lib/kernel/test/erl_distribution_wb_SUITE.erl
index bf332366ed..a8625b064b 100644
--- a/lib/kernel/test/erl_distribution_wb_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_wb_SUITE.erl
@@ -693,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/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index f06fd0fcbe..3eb0c90e3e 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -555,10 +555,10 @@ active_n(Config) when is_list(Config) ->
 %
 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).
 
 
 %% Test that connect/3 has effect.
diff --git a/lib/kernel/test/global_SUITE.erl b/lib/kernel/test/global_SUITE.erl
index a9b1c46dd1..9bc659b6e1 100644
--- a/lib/kernel/test/global_SUITE.erl
+++ b/lib/kernel/test/global_SUITE.erl
@@ -2743,7 +2743,7 @@ many_nodes(Config) when is_list(Config) ->
     ?line 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 ->
@@ -2881,7 +2881,7 @@ sync_0(Config) when is_list(Config) ->
     ?line 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 ->
@@ -3783,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).
diff --git a/lib/kernel/test/global_group_SUITE.erl b/lib/kernel/test/global_group_SUITE.erl
index 2fad1eafdd..7feabb570f 100644
--- a/lib/kernel/test/global_group_SUITE.erl
+++ b/lib/kernel/test/global_group_SUITE.erl
@@ -1204,7 +1204,7 @@ 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() ->
diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl
index 508b090c33..dd6348c610 100644
--- a/lib/kernel/test/heart_SUITE.erl
+++ b/lib/kernel/test/heart_SUITE.erl
@@ -96,7 +96,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]);
 	_ ->
@@ -106,7 +106,7 @@ 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
diff --git a/lib/kernel/test/ignore_cores.erl b/lib/kernel/test/ignore_cores.erl
index 3aaade6853..24b95e273c 100644
--- a/lib/kernel/test/ignore_cores.erl
+++ b/lib/kernel/test/ignore_cores.erl
@@ -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.*$",
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index e7eac08d98..92ed4b051e 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -639,12 +639,12 @@ gethostnative_parallell(Config) when is_list(Config) ->
 
 do_gethostnative_parallell() ->
     ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line {ok,Node} = ?t:start_node(gethost_parallell, slave, 
+    {ok,Node} = test_server: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),
+    test_server:stop_node(Node),
     ok.
 
 parallell_gethost() ->
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index 8cae84b812..e4d658efb7 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -558,10 +558,10 @@ boot2(Config) when is_list(Config) ->
 %% 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);
diff --git a/lib/kernel/test/kernel_SUITE.erl b/lib/kernel/test/kernel_SUITE.erl
index 70493f818e..8619385478 100644
--- a/lib/kernel/test/kernel_SUITE.erl
+++ b/lib/kernel/test/kernel_SUITE.erl
@@ -65,7 +65,7 @@ end_per_testcase(_Case, _Config) ->
 %
 %% 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/pdict_SUITE.erl b/lib/kernel/test/pdict_SUITE.erl
index 1f9348ab5c..61551a3acf 100644
--- a/lib/kernel/test/pdict_SUITE.erl
+++ b/lib/kernel/test/pdict_SUITE.erl
@@ -108,7 +108,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,
@@ -152,7 +152,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),
diff --git a/lib/kernel/test/pg2_SUITE.erl b/lib/kernel/test/pg2_SUITE.erl
index 04eb7feff7..636ff7598d 100644
--- a/lib/kernel/test/pg2_SUITE.erl
+++ b/lib/kernel/test/pg2_SUITE.erl
@@ -220,7 +220,7 @@ loop() ->
 
 %% 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 ->
             Pid = spawn(forever()),
             G = a,
@@ -235,7 +235,7 @@ compat(Config) when is_list(Config) ->
             ?line true = exit(Pid, kill),
             ?line ?UNTIL([] =:= pg2:get_members(a)),
             ?line ?UNTIL([] =:= rpc:call(A, pg2, get_members, [a])),
-            ?t:stop_node(A),
+            test_server:stop_node(A),
 	    ok;
         false ->
 	    {skipped, "No support for old node"}
@@ -624,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
diff --git a/lib/kernel/test/rpc_SUITE.erl b/lib/kernel/test/rpc_SUITE.erl
index bfd55f3b1a..23bb7613cf 100644
--- a/lib/kernel/test/rpc_SUITE.erl
+++ b/lib/kernel/test/rpc_SUITE.erl
@@ -61,13 +61,13 @@ end_per_group(_GroupName, Config) ->
 call(Config) when is_list(Config) ->
     ?line 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, 
+    {ok, N1} = test_server:start_node('3_rpc_SUITE_call', slave,
 				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N2} = ?t:start_node('1_rcp_SUITE_call', slave, 
+    {ok, N2} = test_server:start_node('1_rcp_SUITE_call', slave,
 				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N3} = ?t:start_node('4_rcp_SUITE_call', slave, 
+    {ok, N3} = test_server:start_node('4_rcp_SUITE_call', slave,
 				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N4} = ?t:start_node('8_rcp_SUITE_call', slave, 
+    {ok, N4} = test_server: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, []),
@@ -76,23 +76,23 @@ call(Config) when is_list(Config) ->
     ?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),
+    test_server:stop_node(N1),
+    test_server:stop_node(N2),
+    test_server:stop_node(N3),
+    test_server:stop_node(N4),
     ok.
 
 %% Test different rpc calls.
 block_call(Config) when is_list(Config) ->
     ?line 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, 
+    {ok, N1} = test_server:start_node('3_rpc_SUITE_block_call', slave,
 				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N2} = ?t:start_node('1_rcp_SUITE_block_call', slave, 
+    {ok, N2} = test_server:start_node('1_rcp_SUITE_block_call', slave,
 				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N3} = ?t:start_node('4_rcp_SUITE_block_call', slave, 
+    {ok, N3} = test_server:start_node('4_rcp_SUITE_block_call', slave,
 				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N4} = ?t:start_node('8_rcp_SUITE_block_call', slave, 
+    {ok, N4} = test_server: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, []),
@@ -101,10 +101,10 @@ block_call(Config) when is_list(Config) ->
     ?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),
+    test_server:stop_node(N1),
+    test_server:stop_node(N2),
+    test_server:stop_node(N3),
+    test_server:stop_node(N4),
     ok.
 
 
@@ -112,29 +112,29 @@ block_call(Config) when is_list(Config) ->
 multicall(Config) when is_list(Config) ->
     ?line 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, 
+    {ok, N1} = test_server:start_node('3_rpc_SUITE_multicall', slave,
 				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N2} = ?t:start_node('1_rcp_SUITE_multicall', slave, 
+    {ok, N2} = test_server: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),
+    test_server:stop_node(N1),
+    test_server:stop_node(N2),
     ok.
 
 multicall_timeout(Config) when is_list(Config) ->
     ?line 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, 
+    {ok, N1} = test_server:start_node('11_rpc_SUITE_multicall', slave,
 				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N2} = ?t:start_node('8_rpc_SUITE_multicall', slave, 
+    {ok, N2} = test_server:start_node('8_rpc_SUITE_multicall', slave,
 				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N3} = ?t:start_node('5_rpc_SUITE_multicall', slave, 
+    {ok, N3} = test_server:start_node('5_rpc_SUITE_multicall', slave,
 				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N4} = ?t:start_node('2_rcp_SUITE_multicall', slave, 
+    {ok, N4} = test_server:start_node('2_rcp_SUITE_multicall', slave,
 				   [{args, "-pa " ++ PA}]),
     ?line ok = io:format("~p~n", [[N1, N2]]),
     {[{hej,_,N3},{hej,_,N4}],[N1, N2]} =
@@ -142,17 +142,17 @@ multicall_timeout(Config) when is_list(Config) ->
     ct:sleep({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),
+    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) ->
     ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line {ok, N1} = ?t:start_node('rpc_SUITE_multicall_dies_1', slave, 
+    {ok, N1} = test_server:start_node('rpc_SUITE_multicall_dies_1', slave,
 				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N2} = ?t:start_node('rcp_SUITE_multicall_dies_2', slave, 
+    {ok, N2} = test_server:start_node('rcp_SUITE_multicall_dies_2', slave,
 				   [{args, "-pa " ++ PA}]),
     ?line Nodes = [N1, N2],
     %%
@@ -183,8 +183,8 @@ multicall_dies(Config) when is_list(Config) ->
     ?line {[{badrpc, {'EXIT', killed}}, {badrpc, {'EXIT', killed}}], []} = 
 	do_multicall(Nodes, ?MODULE, suicide, [exit, kill]),
     %%
-    ?line ?t:stop_node(N1),
-    ?line ?t:stop_node(N2),
+    test_server:stop_node(N1),
+    test_server:stop_node(N2),
     ok.
 
 do_multicall(Nodes, Mod, Func, Args) ->
@@ -205,9 +205,9 @@ multicall_node_dies(Config) when is_list(Config) ->
 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, 
+    {ok, N1} = test_server: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, 
+    {ok, N2} = test_server:start_node('rcp_SUITE_multicall_node_dies_2', slave,
 				   [{args, "-pa " ++ PA}]),
     ?line Nodes = [N1, N2],
     ?line {[], Nodes} = rpc:multicall(Nodes, Mod, Func, Args),
@@ -220,7 +220,7 @@ do_multicall_2_nodes_dies(Mod, Func, Args) ->
 %% OTP-3766.
 called_dies(Config) when is_list(Config) ->
     ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line {ok, N} = ?t:start_node(rpc_SUITE_called_dies, slave, 
+    {ok, N} = test_server:start_node(rpc_SUITE_called_dies, slave,
 				  [{args, "-pa " ++ PA}]),
     %%
     ?line rep(fun (Tag, Call, Args) ->
@@ -302,7 +302,7 @@ called_dies(Config) when is_list(Config) ->
 	      end, N, ?MODULE, suicide, [exit,kill]),
     %%
     ?line [] = flush([]),
-    ?line ?t:stop_node(N),
+    test_server:stop_node(N),
     ok.
 
 rep(Fun, N, M, F, A) ->
@@ -379,31 +379,31 @@ called_node_dies(Config) when is_list(Config) ->
     ok.
 
 node_rep(Fun, Name, PA, M, F, A) ->
-    {ok, Na} = ?t:start_node(list_to_atom(Name++"_a"), slave, 
+    {ok, Na} = test_server: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, 
+    catch test_server:stop_node(Na),
+    {ok, Nb} = test_server: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, 
+    catch test_server:stop_node(Nb),
+    {ok, Nc} = test_server:start_node(list_to_atom(Name++"_c"), slave,
 			      [{args, "-pa " ++ PA}]),
     Fun(c, call, [Nc, M, F, A, infinity]),
-    catch ?t:stop_node(Nc),
+    catch test_server:stop_node(Nc),
     %%
-    {ok, Nd} = ?t:start_node(list_to_atom(Name++"_d"), slave, 
+    {ok, Nd} = test_server: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, 
+    catch test_server:stop_node(Nd),
+    {ok, Ne} = test_server: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, 
+    catch test_server:stop_node(Ne),
+    {ok, Nf} = test_server: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),
+    catch test_server:stop_node(Nf),
     ok.
 
 
@@ -412,7 +412,7 @@ node_rep(Fun, Name, PA, M, F, A) ->
 called_throws(Config) when is_list(Config) ->
     ?line PA = filename:dirname(code:which(?MODULE)),
     %%
-    ?line {ok, N} = ?t:start_node(rpc_SUITE_called_throws, slave, 
+    {ok, N} = test_server:start_node(rpc_SUITE_called_throws, slave,
 				  [{args, "-pa " ++ PA}]),
     %%
     ?line rep(fun (Tag, Call, Args) ->
@@ -424,21 +424,21 @@ called_throws(Config) when is_list(Config) ->
 			  {Tag,apply(rpc, Call, Args)}
 	      end, N, erlang, throw, [{'EXIT',reason}]),
     %%
-    ?line ?t:stop_node(N),
+    test_server:stop_node(N),
     ok.
 
 
 
 call_benchmark(Config) when is_list(Config) ->
     PA = filename:dirname(code:which(?MODULE)),
-    {ok, Node} = ?t:start_node(rpc_SUITE_call_benchmark, slave,
+    {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),
+    test_server:stop_node(Node),
     Res.
 
 do_call_benchmark(Node, M) when is_integer(M), M > 0 ->
@@ -461,9 +461,9 @@ async_call(Config) when is_list(Config) ->
     %% 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),
+    {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),
     ?line Promise1 = rpc:async_call(Node1, ?MODULE, f, []),
     ?line Promise2 = rpc:async_call(Node2, ?MODULE, f, []),
     ?line Promise3 = rpc:async_call(Node3, ?MODULE, f, []),