anchor.diff:  	    nomatch
       end;
   
  +%% to match variable data as a result of an aborted test case
  +locate({TEH,tc_done,{undefined,undefined,{testcase_aborted,
  +					  {abort_current_testcase,Func},'_'}}},
  +       Node, [Ev|Evs], Config) ->
  +    case Ev of
  +	{TEH,#event{name=tc_done, node=Node,
  +		    data={undefined,undefined,
  +			  {testcase_aborted,{abort_current_testcase,Func},_}}}} ->
  +	    {Config,Evs};
  +	_ ->
  +	    nomatch
  +    end;
  +
   %% to match variable data as a result of a failed test case
  -locate({TEH,tc_done,{Mod,Func,{failed,{error,{Slogan,'_'}}}}}, Node, [Ev|Evs], Config) ->
  +locate({TEH,tc_done,{Mod,Func,R={SkipOrFail,{_ErrInd,ErrInfo}}}},
  +       Node, [Ev|Evs], Config) when ((SkipOrFail == skipped) or
  +				     (SkipOrFail == failed)) and
  +				    ((size(ErrInfo) == 2) or
  +				     (size(ErrInfo) == 3)) ->
       case Ev of
   	{TEH,#event{name=tc_done, node=Node, 
  -		    data={Mod,Func,{failed,{error,{Slogan,_}}}}}} ->
  -	    {Config,Evs};
  -	_ ->
  -	    nomatch
  -    end;
  -
  -%% to match variable data as a result of an aborted test case
  -locate({TEH,tc_done,{undefined,undefined,{testcase_aborted,
  -					  {abort_current_testcase,Func},'_'}}}, 
  -       Node, [Ev|Evs], Config) ->
  -    case Ev of
  -	{TEH,#event{name=tc_done, node=Node, 
  -		    data={undefined,undefined,
  -			  {testcase_aborted,{abort_current_testcase,Func},_}}}} -> 
  -	    {Config,Evs};
  +		    data={Mod,Func,Result}}} ->
  +	    case result_match(R, Result) of
  +		true ->
  +		    {Config,Evs};
  +		false ->
  +		    nomatch
  +	    end;
   	_ ->
   	    nomatch
       end;
  
positive.code: 				 data={M,{init_per_group,GroupName,EvProps}}}},
  		     {TEH,#event{name=tc_done, 
  				 node=Node, 
  				 data={M,{init_per_group,GroupName,EvProps},R}}} | Es] ->
  			case proplists:get_value(shuffle, Props) of
  			    '_' ->
  				case proplists:get_value(shuffle, EvProps) of
  				    false ->
  					exit({no_shuffle_prop_found,{M,init_per_group,
  								     GroupName,EvProps}});
  				    _ ->
  					PropsCmp = proplists:delete(shuffle, EvProps),
  					PropsCmp = proplists:delete(shuffle, Props)
  				end;
  			    _ ->
  				Props = EvProps
  			end,
  			test_server:format("Found ~p!", [InitStart]),
  			test_server:format("Found ~p!", [InitDone]),
  			{TEs,Es};
  		    _ ->
  			nomatch
  		end;
  
negative.code: 						  node=EvNode,
  						  data={Mod,Func,Result}}} <- Done, 
  				     EH == TEH, EvNode == Node, Mod == M, 
  				     Func == F, result_match(R, Result)] of
  			      [TcDone|_] ->
  				  test_server:format("Found ~p!", [TEv]),
  				  {lists:delete(TcDone, Done),RemEvs,RemSize};
  