anchor.diff:  		    _ ->
   			ok
   		end,
  -		%% if end_per_testcase fails a warning should be
  -		%% printed as comment
  -		Comment1 = if Comment == "" -> 
  -				   "";
  -			      true -> 
  -				   Comment ++ test_server_ctrl:xhtml("<br>",
  -								     "<br />")
  -			   end,
  -		%% finished, report back
  +		Warn = "<font color=\"red\">"
  +		       "WARNING: end_per_testcase timed out!</font>",
  +		%% 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,[],
  -			   [Comment1,"<font color=\"red\">"
  -			    "WARNING: end_per_testcase timed out!"
  -			    "</font>"]}}
  +			  {TVal/1000,RetVal,FailLoc,[],Warn}}
   	end,
       spawn_link(FwCall);
   
  -spawn_fw_call(FwMod,FwFunc,_,_Pid,{framework_error,FwError},_,SendTo,_Comment) ->
  +spawn_fw_call(FwMod,FwFunc,_,_Pid,{framework_error,FwError},_,SendTo) ->
       FwCall =
   	fun() ->
  +		%% set group leader so that printouts/comments
  +		%% from the framework get printed in the logs
  +		group_leader(SendTo, self()),
   		test_server_sup:framework_call(report, [framework_error,
  -							{{FwMod,FwFunc},FwError}]),
  +							{{FwMod,FwFunc},
  +							 FwError}]),
   		Comment =
   		    lists:flatten(
   		      io_lib:format("<font color=\"red\">"
  -				    "WARNING! ~w:~w failed!</font>", [FwMod,FwFunc])),
  +				    "WARNING! ~w:~w failed!</font>",
  +				    [FwMod,FwFunc])),
   	    %% finished, report back
   	    SendTo ! {self(),fw_notify_done,
  -		      {died,{error,{FwMod,FwFunc,FwError}},{FwMod,FwFunc},[],Comment}}
  +		      {died,{error,{FwMod,FwFunc,FwError}},
  +		       {FwMod,FwFunc},[],Comment}}
   	end,
       spawn_link(FwCall);
   
  -spawn_fw_call(Mod,Func,_,Pid,Error,Loc,SendTo,Comment) ->
  +spawn_fw_call(Mod,Func,_,Pid,Error,Loc,SendTo) ->
       FwCall =
   	fun() ->
  +		%% set group leader so that printouts/comments
  +		%% from the framework get printed in the logs
  +		group_leader(SendTo, self()),
   		case catch fw_error_notify(Mod,Func,[],
   					   Error,Loc) of
   		    {'EXIT',FwErrorNotifyErr} ->
  
positive.code: 			    %% timout during framework call
  			    spawn_fw_call(FwMod,FwFunc,CurrConf,Pid,
  					  {framework_error,{timetrap,TVal}},
  					  unknown,self(),Comment);
  			Loc1 ->
  			    {Mod,_Func} = get_mf(Loc1),
  			    spawn_fw_call(Mod,InitOrEnd,CurrConf,Pid,
  					  {timetrap_timeout,TVal},
  					  Loc1,self(),Comment)
  		    end,
  		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
  		{testcase_aborted,AbortReason,AbortLoc} ->
  
negative.code: 			    %% abort during framework call
  			    spawn_fw_call(FwMod,FwFunc,CurrConf,Pid,
  					  {framework_error,ErrorMsg},
  					  unknown,self()),
  			    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
  						  Comment,undefined);
  			Loc1 ->
  