Merge branch 'peppe/common_test/cth_improvements' into maint

* peppe/common_test/cth_improvements:
  Add missing internal hook functions
  Fix remaining issues
  Update ct_hooks test suites
  Introduce new CT hook functions

OTP-13242

25 files changed, 1378 insertions, 1085 deletions

diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 8fb7a03bb0..8e25bfece0 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -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 ->
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/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/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_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl
index f00b2bbb43..8353f5936c 100644
--- a/lib/common_test/test/ct_hooks_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE.erl
@@ -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/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 671674c617..f62eb88ccf 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -714,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
@@ -725,16 +725,29 @@ 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 ->
 				    timer:sleep(1),
-				    group_leader() ! {printout,12,
-						      "WARNING! "
-						      "~w:end_per_testcase(~w, ~p)"
-						      " crashed!\n\tReason: ~p\n",
-						      [Mod,Func,Conf,Why]}
+				    GLMsg = {printout,12,
+					     "WARNING! "
+					     "~w:end_per_testcase(~w, ~p)"
+					     " crashed!\n\tReason: ~p\n",
+					     [Mod,Func,Conf,Why]},
+				    group_leader() ! GLMsg					
 			    end,
 			    Supervisor ! {self(),end_conf}
 		    end,
@@ -755,28 +768,38 @@ 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) ->
+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} =
@@ -790,24 +813,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);
 
@@ -830,10 +867,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,[],
@@ -845,8 +884,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 ->
@@ -923,32 +961,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}).
@@ -963,31 +1007,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 ->
@@ -1013,36 +1067,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,[]}
@@ -1068,7 +1133,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 ->
diff --git a/lib/test_server/src/ts_install_cth.erl b/lib/test_server/src/ts_install_cth.erl
index ec0d54ccde..0462e62611 100644
--- a/lib/test_server/src/ts_install_cth.erl
+++ b/lib/test_server/src/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(),