Using the same testdata for testing xmerl_scan and xmerl_sax_parser.

20 files changed, 3907 insertions, 5080 deletions

diff --git a/lib/xmerl/test/Makefile b/lib/xmerl/test/Makefile
index 775e323dd4..0f8cd88c13 100644
--- a/lib/xmerl/test/Makefile
+++ b/lib/xmerl/test/Makefile
@@ -120,10 +120,8 @@ release_tests_spec: opt
 	cp $(XML_FILES) $(RELSYSDIR)
 	@tar cfh - xmerl_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 	@tar cfh - xmerl_std_SUITE_data | (cd $(RELSYSDIR); tar xf -)
-	@tar cfh - xmerl_sax_std_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 	@tar cfh - xmerl_xsd_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 	@tar cfh - xmerl_xsd_MS2002-01-16_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 	@tar cfh - xmerl_xsd_NIST2002-01-16_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 	@tar cfh - xmerl_xsd_Sun2002-01-16_SUITE_data | (cd $(RELSYSDIR); tar xf -)
-	@tar cfh - proprietary | (cd $(RELSYSDIR); tar xf -)
 	chmod -f -R u+w $(RELSYSDIR)
diff --git a/lib/xmerl/test/gen_testsuits-2001-01-16.erl b/lib/xmerl/test/gen_testsuits-2001-01-16.erl
deleted file mode 100644
index 32b4bd836e..0000000000
--- a/lib/xmerl/test/gen_testsuits-2001-01-16.erl
+++ /dev/null
@@ -1,744 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : test2.erl
-%%% Author  : Bertil Karlsson <bertil@finrod>
-%%% Description : 
-%%%
-%%% Created : 26 Sep 2006 by Bertil Karlsson <bertil@finrod>
-%%%-------------------------------------------------------------------
--module(gen_testsuits-2001-01-16).
-
--compile(export_all).
--include_lib("xmerl/include/xmerl.hrl").
-
-
-%% generate(Suite) generates test suite modules. In those modules are
-%% all test cases extracted from the corresponding ".testSet"
-%% file. This program must be in the xmlSchema2002-01-16 directory of
-%% the unpacked xmlSchema2002-01-16.tar file. The test suite files are
-%% created in this directory.
-generate(all) ->
-    generate(nist),
-    generate(sun),
-    generate(msx);
-generate(nist) -> 
-    io:format("generating test suite source ~p~n",
-	      ["NISTXMLSchema1-0-20020116.testSet"]),
-    generate("NISTXMLSchema1-0-20020116.testSet"),
-    io:format("compiling test suite source~n",[]),
-    {ok,_}=compile:file("xmerl_xsd_NIST2002-01-16_SUITE.erl",[{i,"/view/bertil_xmerl/clearcase/otp/erts/lib/test_server/include/"},{i,"/view/bertil_xmerl/clearcase/otp/erts/lib/xmerl/include/"}]);
-generate(sun) ->
-    io:format("generating test suite source ~p~n",
-	      ["SunXMLSchema1-0-20020116.testSet"]),
-    generate("SunXMLSchema1-0-20020116.testSet"),
-    io:format("compiling test suite source~n",[]),
-    {ok,_}=compile:file("xmerl_xsd_Sun2002-01-16_SUITE.erl",[{i,"/view/bertil_xmerl/clearcase/otp/erts/lib/test_server/include/"},{i,"/view/bertil_xmerl/clearcase/otp/erts/lib/xmerl/include/"}]);
-generate(msx) ->
-    io:format("generating test suite source ~p~n",
-	      ["MSXMLSchema1-0-20020116.testSet"]),
-    generate("MSXMLSchema1-0-20020116.testSet"),
-    io:format("compiling test suite source~n",[]),
-    {ok,_}=compile:file("xmerl_xsd_MS2002-01-16_SUITE.erl",[{i,"/view/bertil_xmerl/clearcase/otp/erts/lib/test_server/include/"},{i,"/view/bertil_xmerl/clearcase/otp/erts/lib/xmerl/include/"}]);
-generate(Suite) ->
-    {E,_} = xmerl_scan:file(Suite),
-    {ok,FileName} = create_suite_name(xmerl_xpath:string("./@name",E)),
-    case create_suite_file(FileName) of
-	{ok,IO} ->
-	    emit_licens_text(IO),
-	    emit_module_header(IO,list_to_atom(filename:rootname(FileName))),
-	    generate2(abbrev(Suite),E,IO);
-	_ ->
-	    failed
-    end.
-generate2(Suite,E,IO) ->
-    %% Each testGroup name is a function in the test suite.
-    TestGroupNames = test_case_names(Suite),
-    emit_all_function(TestGroupNames,IO),
-    emit_init_per_suite(IO,Suite),
-    emit_init_per_testcase(IO),
-    TestGroups=[X||X=#xmlElement{}<-E#xmlElement.content],
-    TestGroupGroups = group_testGroups(test_case_prefix(Suite),TestGroups),
-    generate_test_case_functions(Suite,TestGroupGroups,IO).
-    
-group_testGroups(Prefs,TGs) ->
-    group_testGroups(Prefs,TGs,[]).
-group_testGroups([],[],Acc) ->
-    lists:reverse(Acc);
-group_testGroups(Prefs,TGs,Acc) ->
-    SplitPrefs = fun([{_,[]}|T],F) ->
-			 F(T,F);
-		    ([{N,[H|T1]}|T2],_) ->
-			 {H,N,[{N,T1}|T2]};
-		    ([H|T],_) ->
-			 {H,H,T};
-		    (A,B) ->
-			 io:format("SplitRefs: ~nA: ~p~nB: ~p~nTGs: ~p~n",[A,B,hd(TGs)]),
-			 exit(dummy)
-		 end,
-    {Pref,TCName,Prefs2} = SplitPrefs(Prefs,SplitPrefs),
-    Pred = 
-	fun(E) ->
-		case xmerl_xpath:string("@name",E) of
-		    [#xmlAttribute{value=V}] -> 
-			lists:prefix(Pref,V);
-		    _ -> false
-		end
-	end,
-    {TGG,TGs2}=lists:splitwith(Pred,TGs),
-%%     case TGG of
-%% 	[] ->
-%% 	    io:format("hd(Prefs): ~p~n",[hd(Prefs)]);
-%% 	_ ->
-%% 	    ok
-%%     end,
-    group_testGroups(Prefs2,TGs2,acc_group({TCName,TGG},Acc)).
-
-acc_group({Name,TGG},[{Name,AccP}|Acc]) ->
-    [{Name,AccP++TGG}|Acc];
-acc_group(TGG,Acc) ->
-    [TGG|Acc].
-
-generate_test_case_functions(_Suite,[],IO)  ->
-    %%emit_schema_test(IO),
-    %%emit_instance_test(IO),
-    file:close(IO);
-generate_test_case_functions(Suite,[{TCName,TGG}|TGGs],IO) ->
-    emit_test_case_func(true,TCName,comment(TCName,TGG),IO),
-    generate_test_cases(Suite,TGG,0,0,IO),
-    generate_test_case_functions(Suite,TGGs,IO).
-
-generate_test_cases(_,[],SIndex,EIndex,IO) ->
-    emit_result_list_test(IO,SIndex,EIndex),
-%%     emit_schema_result_list(IO,SIndex,EIndex),
-%%     emit_instance_result_list(IO,SIndex,EIndex),
-    ok;
-generate_test_cases(Suite,[El|Els],SIndex,EIndex,IO) ->
-    SchemaTest = xmerl_xpath:string("schemaTest",El),
-    InstanceTest = xmerl_xpath:string("instanceTest",El),
-    SIndex2 = generate_schema_tests(Suite,SchemaTest,IO,SIndex,
-				    any_instance_tests(InstanceTest)),
-
-    EIndex2=generate_instance_tests(InstanceTest,mk_state(SIndex),EIndex,IO),
-    case {Els,any_tests(SchemaTest,InstanceTest)} of
-%% 	{[],true} ->
-%% 	    emit(IO,[".",nl]);
-%%	{_,true} -> 
-%%	    emit(IO,[",",nl]);
-	_ ->
-	    ok
-    end,
-    emit(IO,[nl,nl]),
-    generate_test_cases(Suite,Els,SIndex2,EIndex2,IO).
-
-    
-
-%% 0 or 1 schemaTest/ testGroup, but a schemaTest may reference many schemas
-generate_schema_tests(_Suite,[],_IO,SIndex,_) ->
-    SIndex;
-generate_schema_tests(Suite,[SchemaTest],IO,SIndex,AnyInstanceTests) ->
-    case xmerl_xpath:string("current[@status=\"accepted\" or @status=\"stable\"]",SchemaTest) of
-	[] ->
-	    SIndex;
-	_ ->
-	    case exclude_case(Suite,xmerl_xpath:string("@name",SchemaTest)) of
-		true ->
-		    SIndex;
-		_ ->
-		    Refs = xmerl_xpath:string("schemaDocument/@xlink:href",
-					      SchemaTest),
-		    ExpectedValue = xmerl_xpath:string("expected/@validity",
-						       SchemaTest),
-		    ExpectedReturnValue = 
-			expected_return_value_st(ExpectedValue,SIndex),
-		    generate_schema_validation_call(ExpectedReturnValue,
-						    Refs,0,SIndex,
-						    IO,length(Refs)>1,
-						    AnyInstanceTests)
-	    end
-    end.
-
-
-generate_schema_validation_call(_RetVal,[],_Num,Sindex,_IO,_,false) ->
-%%    emit(IO,[RetVal]),
-    %% emit(IO,[".",nl]),
-    Sindex;
-generate_schema_validation_call(_RetVal,[],_Num,Sindex,_IO,_,true) ->
- %%   emit(IO,[RetVal]),
-%    emit(IO,[",",nl]),
-    Sindex;
-generate_schema_validation_call(RetVal,[#xmlAttribute{value=Link}|Refs],
-				Num,Sindex,IO,ManySchemas,AnyInstanceTests) ->
-    XsdBase = filename:dirname(Link),
-%%    FileName = lists:flatten(io_lib:format("filename:join([?config(data_dir,Config), ~p])", [list_to_atom(Link)])),
-    AccState =
-	case Num of
-	    0 ->
-		"";
-	    _ ->
-		",{state," ++ mk_state(Sindex - 1) ++ "}"
-	end,
-    if
-	Sindex == 0 ->
-	    emit(IO,[indent(2),mk_STResList(0)," = [],",nl,nl]);
-	true ->
-	    ok
-    end,
-    RetState =
-	if
-	    ManySchemas;AnyInstanceTests ->
-		mk_state(Sindex);
-	    true ->
-		"_"
-	end,
-%%     emit(IO,[indent(2),"?line ",mk_state(Num)," = xmerl_xsd:process_schema(",nl,
-%% 	     indent(25),FileName,",",nl,
-%% 	     indent(25),"[{xsdbase,filename:join([?config(data_dir,Config),'",
-%% 	     XsdBase,"'])}",AccState,"]),",nl]),
-    emit(IO,[indent(2),"?line {",mk_STRes(Sindex),",",RetState,
-				  "} = xmerl_xsd_lib:schema_test(Config,",
-	     list_to_atom(Link),",",list_to_atom(XsdBase),",",RetVal,AccState,"),",nl]),
-    emit(IO,[indent(2),mk_STResList(Sindex+1)," = [",mk_STRes(Sindex),"|",
-	     mk_STResList(Sindex),"],",nl]),
-    generate_schema_validation_call(RetVal,Refs,Num+1,Sindex+1,IO,
-				    ManySchemas,AnyInstanceTests).
-
-%% 0 or many instanceTests / testGroup
-generate_instance_tests([],_,EI,_IO) ->
-    EI;
-generate_instance_tests([InstanceTest|ITs],State,Num,IO) ->
-    case xmerl_xpath:string("current[@status=\"accepted\" or @status=\"stable\"]",InstanceTest) of
-	[] ->
-	    ok;
-	_ ->
-	    if
-		Num == 0 ->
-		    emit(IO,[indent(2),mk_ITResList(0)," = [],",nl]);
-		true ->
-		    ok
-	    end,
-	    [Ref] = xmerl_xpath:string("instanceDocument/@xlink:href",InstanceTest),
-	    ExpectedValue = xmerl_xpath:string("expected/@validity",
-					       InstanceTest),
-	    ExpectedReturnValue = expected_return_value_it(ExpectedValue),
-	    generate_instance_validation_call(ExpectedReturnValue,Ref,
-					      State,Num,IO)
-    end,
-    case ITs of
-	[] -> ok; %%emit(IO,[".",nl]);
-	_ ->ok% emit(IO,[",",nl])
-    end,
-    generate_instance_tests(ITs,State,Num+1,IO).
-    
-generate_instance_validation_call(ExpectedReturnValue,
-				  #xmlAttribute{value=Link},State,Num,IO) ->
-    XMLBase = filename:dirname(Link),
-    %%FileName = filename:basename(Link),
-%%    FileName = lists:flatten(io_lib:format("filename:join([?config(data_dir,Config), ~p])", [list_to_atom(Link)])),
-
-%%    E = mk_E(Num),
-
-    Res = mk_ITRes(Num),
-
-%%     emit(IO,[indent(2),"?line {",E,",_} = xmerl_scan:file(",FileName,",",nl,
-%% 	     indent(32),"[{xmlbase,filename:join([?config(data_dir,Config),'",
-%% 	     XMLBase,"'])}]),",nl]),
-
-    emit(IO,[indent(2),"?line ",Res," = xmerl_xsd_lib:instance_test(Config,",list_to_atom(Link),",",list_to_atom(XMLBase),",",ExpectedReturnValue,",",State,"),",nl]),
-    emit(IO,[indent(2),mk_ITResList(Num+1)," = [",Res,"|",mk_ITResList(Num),"],",nl]).
-
-%%      emit(IO,[indent(2),"?line ",ExpectedReturnValue,
-%% 	     " = xmerl_xsd:validate(",E,",[{state,",State,"}])"]).
-
-any_tests([],[]) ->
-    false;
-any_tests(_,_) ->
-    true.
-
-any_instance_tests([]) ->
-    false;
-any_instance_tests(_) ->
-    true.
-
-expected_return_value_it([#xmlAttribute{value=Validity}]) ->
-    case Validity of
-	"valid" ->
-	    valid;
-	"invalid" ->
-	    invalid;
-	_ ->
-	    notKnown
-    end;
-expected_return_value_it([]) ->
-    "_".
-
-expected_return_value_st([#xmlAttribute{value=Validity}],_Num) ->
-%%    RetVal =
-    case Validity of
-%% 	"valid" -> "#xsd_state{errors=[]}";
-%% 	"invalid" -> "#xsd_state{errors=[_Err|_Errs]}";
-%% 	_ -> "#xsd_state{}"
-%%     end,
-%%     "  ?line " ++ RetVal ++ " = " ++ mk_state(Num).
-	"valid" ->
-	    valid;
-	"invalid" ->
-	    invalid;
-	_ ->
-	    notKnown
-    end.
-
-create_suite_name([#xmlAttribute{value=Name}]) ->
-    FileName = lists:concat(['xmerl_','xsd_',Name,'_SUITE.erl']),
-    {ok,FileName};
-create_suite_name(_) ->
-    error.
-
-create_suite_file(FileName)  ->
-    file:delete(FileName),
-    case file:open(FileName,[append]) of
-	{ok,IO} -> {ok,IO};
-	_ -> failed
-    end.
-
-emit_licens_text(IO) ->
-    emit(IO,[
-"%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%",nl,
-"%%",nl,
-"%%% Purpose : Test suite for the xmerl application",nl,nl,
-"%% Do NOT edit this file. It is generated by the generate_xsd_suite module",nl,"%% For more info read the comments in the header of that file.",nl,nl]).
-
-emit_module_header(IO,Module) ->
-    emit(IO,["-module(",{asis,Module},").",nl,nl]),
-    emit(IO,["-compile(export_all).",nl,nl]),
-    emit(IO,["-include(",{asis,"test_server.hrl"},").",nl]),
-    emit(IO,["-include_lib(",{asis,"xmerl/include/xmerl.hrl"},").",nl]),
-    emit(IO,["-include_lib(",{asis,"xmerl/include/xmerl_xsd.hrl"},").",nl,nl,nl]).
-
-emit_all_function(TestGroupNames,IO) ->
-    
-    emit(IO,["all(suite) -> [",nl]),
-    emit(IO,[list_to_atom(X)||X<-indent_all(TestGroupNames)]),
-    emit(IO,["].",nl,nl,nl]).
-
-emit_init_per_suite(IO,Suite) ->
-    emit(IO,["%% initialization before the test suite",nl]),
-    emit(IO,["init_per_suite(Config) ->",nl,
-	     "  Dog=test_server:timetrap({minutes,10}),",nl,
-	     "  xmerl_xsd_lib:unpack(Config,",Suite,"),",nl,
-	     "  {ok,LogFile} = xmerl_xsd_lib:create_error_log_file(Config,",Suite,"),",nl,
-	     "  test_server:timetrap_cancel(Dog),",nl,
-	     "  [{suite,",Suite,"},{xmerl_error_log,LogFile}|Config].",nl,nl]),
-    emit(IO,["end_per_suite(Config) ->",nl,
-	     "  xmerl_xsd_lib:rmdir(Config,",Suite,"),",nl,
-	     "  xmerl_xsd_lib:close_error_log_file(Config),",nl,
-	     "  ok.",nl,nl]).
-    
-emit_init_per_testcase(IO) ->
-    emit(IO,["%% initialization before each testcase",nl]),
-    emit(IO,["init_per_testcase(TestCase,Config) ->",nl,
-	     indent(2),"Dog=test_server:timetrap({minutes,3}),",nl,
-	     indent(2),"[{testcase,TestCase},{watchdog, Dog}|Config].",nl,nl]),
-    emit(IO,["%% clean up after each testcase",nl,
-	     "end_per_testcase(_Func,Config) ->",nl,
-	     indent(2),"Dog=?config(watchdog, Config),",nl,
-	     indent(2),"test_server:timetrap_cancel(Dog),",nl,
-	     indent(2),"ok.",nl,nl]).
-
-emit_test_case_func(false,TestCaseName,_Doc,IO) ->
-    emit(IO,["%% skipped testcase ",{asis,TestCaseName},".",nl,
-	     "%% There were no schemaTest case or instanceTest case.",nl,nl]);
-emit_test_case_func(true,TestCaseName,Doc,IO) ->
-%%    emit(IO,indent_comment(Doc)),
-    emit(IO,Doc),
-    emit(IO,[nl,{asis,list_to_atom(TestCaseName)},"(Config) when is_list(Config) ->",nl]).
-
-
-emit_result_list_test(IO,0,0) ->
-    emit(IO,["  xmerl_xsd_lib:compare_test_results(Config,[],[]).",nl,nl]);
-emit_result_list_test(IO,STI,0) ->
-    emit(IO,["  xmerl_xsd_lib:compare_test_results(Config,",mk_STResList(STI),
-	     ",[]).",nl,nl]);
-emit_result_list_test(IO,0,ITI) ->
-    emit(IO,["  xmerl_xsd_lib:compare_test_results(Config,[],",mk_ITResList(ITI),
-	     ").",nl,nl]);
-emit_result_list_test(IO,STI,ITI) ->
-    emit(IO,["  xmerl_xsd_lib:compare_test_results(Config,",mk_STResList(STI),
-	     ",",mk_ITResList(ITI),").",nl,nl]).
-
-emit_schema_result_list(_IO,0,_) ->
-    ok;
-emit_schema_result_list(IO,SIndex,0) ->
-    emit(IO,[indent(2),"STResults = lists:reverse(",mk_STResList(SIndex),"),",nl]);
-emit_schema_result_list(IO,SIndex,_) ->
-    emit(IO,[indent(2),"STResults = lists:reverse(",mk_STResList(SIndex),"),",nl]).
-
-emit_instance_result_list(_IO,0,0) ->
-    ok;
-emit_instance_result_list(IO,_,0) ->
-    emit(IO,[indent(2),"xmerl_xsd_lib:compare_test_results(Config,STResults,[])).",nl]);
-emit_instance_result_list(IO,0,I) ->
-    emit(IO,[indent(2),"xmerl_xsd_lib:compare_test_results(Config,[],lists:reverse(",mk_ITResList(I),")).",nl]);
-emit_instance_result_list(IO,_,I) ->
-%%    emit(IO,indent_all(res_list(0,I))).
-%%    emit(IO,["ITResults =",nl,"["]++res_list(0,I-1,fun mk_ITRes/1)++["].",nl]).
-    emit(IO,[indent(2),"xmerl_xsd_lib:compare_test_results(Config,STResults,lists:reverse(",mk_ITResList(I),")).",nl]).
-    
-
-emit(IO,[nl|T]) ->
-    io:format(IO,"~n",[]),
-    emit(IO,T);
-emit(IO,[comma|T]) ->
-    io:format(IO,",",[]),
-    emit(IO,T);
-emit(IO,[H|T]) ->
-    print(IO,H),
-    emit(IO,T);
-emit(_,[]) ->
-    ok.
-
-print(IO,Str) when is_list(Str) ->
-    io:format(IO,"~s",[Str]);
-print(IO,{asis,Sym}) ->
-    io:format(IO,"~p",[Sym]);
-print(IO,Term) ->
-    io:format(IO,"~p",[Term]).
-
-mk_state(I) ->
-    mk_VarNum("S",I).
-
-mk_E(Num) ->
-    mk_VarNum("E",Num).
-
-mk_VarNum(Var,Num) ->
-    lists:concat([Var,Num]).
-
-mk_ITRes(Num) ->
-    mk_VarNum("ITRes",Num).
-mk_STRes(Num) ->
-    mk_VarNum("STRes",Num).
-mk_STResList(Num) ->
-    mk_VarNum("STResList",Num).
-mk_ITResList(Num) ->
-    mk_VarNum("ITResList",Num).
-
-res_list(N,N,VariableFun) ->
-    [VariableFun(N)];
-res_list(M,N,VariableFun) ->
-    [VariableFun(M),comma|res_list(M+1,N,VariableFun)].
-
-indent(I) ->
-    lists:flatten(lists:duplicate(I," ")).
-
-indent_all([H|T]) ->
-    indent_all(T,length(H),[H]).
-indent_all([],_Col,Acc) ->
-    lists:reverse(Acc);
-indent_all([H|T],Col,Acc) when is_list(H) ->
-    case length(H)+Col of
-	I when I < 80 ->
-	    indent_all(T,I+1,[H,"comma"|Acc]);
-	_I ->
-	    indent_all(T,length(H),[H,"nl","comma"|Acc])
-    end.
-
-indent_comment(Comment) ->
-    indent_comment(string:tokens(Comment,"\n\t\s"),3,["%% "]).
-indent_comment([],_,Acc) ->
-    lists:reverse(Acc);
-indent_comment([H|T],Col,Acc) ->
-    case length(H) + Col of
-	I when I > 80 ->
-	    indent_comment(T,length(H) + 3,[H,"%% ",nl|Acc]);
-	I ->
-	    indent_comment(T,I + 1,[H," "|Acc])
-    end.
-
-test_case_names(nist) ->
-    [X||X<-test_case_prefix(nist)];
-test_case_names(msx) ->
-    [X||X<-lists:map(fun({N,_})->N;(N)when is_list(N) -> N end,test_case_prefix(msx))];
-test_case_names(sun) ->
-    test_case_prefix(sun).
-
-abbrev("NISTXMLSchema1-0-20020116.testSet") ->
-    nist;
-abbrev("MSXMLSchema1-0-20020116.testSet") ->
-    msx;
-abbrev(_) ->
-    sun.
-test_case_prefix(msx) ->
-    ["att","ct","elem","group","idc_","id",
-     {"mgABCD",["mgA","mgB","mgC","mgD"]},
-     {"mgEFG",["mgE","mgF","mgG"]},{"mgHIJ",["mgH","mgI","mgJ"]},
-     "mgK",{"mgLM",["mgL","mgM"]},"mgN",{"mgOP",["mgO","mgP"]},
-     {"mgQR",["mgQ","mgR"]},"mgS",
-     {"particlesAB",["particlesA","particlesB"]},
-     {"particlesCDE",["particlesC","particlesD","particlesE"]},
-     {"particlesFHI",["particlesF","particlesH","particlesI"]},
-     "particlesJ",
-     {"particlesKOSRTQUVW",
-      ["particlesK","particlesO","particlesS","particlesR","particlesT",
-       "particlesQ","particlesU","particlesV","particlesW"]},
-     {"stABCDE",["stA","stB","stC","stD","stE"]},
-     {"stFGH",["stF","stG","stH"]},{"stIJK",["stI","stJ","stK"]},
-     "stZ",{"wildABCDEF",["wildA","wildB","wildC","wildD","wildE","wildF"]},
-     {"wildGHI",["wildG","wildH","wildI"]},
-     {"wildJKLMNQOP",["wildJ","wildK","wildL","wildM","wildN",
-			    "wildQ","wildO","wildP"]},"wildZ"];
-test_case_prefix(nist) ->
-    ["NISTSchema-anyURI","NISTSchema-base64Binary","NISTSchema-boolean",
-     "NISTSchema-byte","NISTSchema-date-","NISTSchema-dateTime",
-     "NISTSchema-decimal","NISTSchema-double","NISTSchema-duration",
-     "NISTSchema-float","NISTSchema-gDay","NISTSchema-gMonth-",
-     "NISTSchema-gMonthDay","NISTSchema-gYear-","NISTSchema-gYearMonth",
-     "NISTSchema-hexBinary","NISTSchema-ID","NISTSchema-int-",
-     "NISTSchema-integer","NISTSchema-language","NISTSchema-long",
-     "NISTSchema-Name","NISTSchema-NCName","NISTSchema-negativeInteger",
-     "NISTSchema-NMTOKEN","NISTSchema-nonNegativeInteger",
-     "NISTSchema-nonPositiveInteger","NISTSchema-normalizedString",
-     "NISTSchema-positiveInteger","NISTSchema-QName","NISTSchema-short",
-     "NISTSchema-string","NISTSchema-time","NISTSchema-token",
-     "NISTSchema-unsignedByte","NISTSchema-unsignedInt",
-     "NISTSchema-unsignedLong","NISTSchema-unsignedShort"];
-test_case_prefix(sun) ->
-    ["Sun-idc001.nogen", "Sun-idc002.e", "Sun-idc002b.e", "Sun-idc003.e",
-     "Sun-idc004.nogen", "Sun-idc004a.e", "Sun-idc005.nogen",
-     "Sun-idc006.nogen", "Sun-xsd001", "Sun-xsd002", "Sun-xsd003-1.e",
-     "Sun-xsd003-2.e", "Sun-xsd003a", "Sun-xsd003b", "Sun-xsd004",
-     "Sun-xsd005", "Sun-xsd006", "Sun-xsd008", "Sun-xsd011", "Sun-xsd012",
-     "Sun-xsd013.e", "Sun-xsd014.e", "Sun-xsd015.e", "Sun-xsd016.e",
-     "Sun-xsd017.e", "Sun-xsd018.e", "Sun-xsd019.e", "Sun-xsd020.e",
-     "Sun-xsd020-2.e", "Sun-xsd020-3.e", "Sun-xsd020-4.e", "Sun-xsd021",
-     "Sun-xsd022", "Sun-xsd023.e", "Sun-xsiType1", "Sun-xsiType-block-1",
-     "Sun-xsiType-block-2", "Sun-xsiType-block-3", "Sun-xsiType-block-4",
-     "Sun-type-and-subst-1"].
-
-comment([$S,$u,$n|_],[TG]) ->
-    case xmerl_xpath:string("annotation/documentation/text()",TG) of
-	L=[#xmlText{}|_] ->
-	    ["%% "|[X||#xmlText{value=X}<-L]];
-	_ ->
-	    ["%%"]
-    end;
-comment("att",_) ->
-    ["%% Syntax Checking for Attribute Declaration",nl];
-comment("ct",_) ->
-    ["%% Syntax Checking for top level complexType Declaration.",nl,
-    "%% Syntax Checking for simpleContent complexType Declaration.",nl,
-    "%% Syntax Checking for comlexContent complexType Declaration",nl,
-    "%% complexType Validation checking",nl,
-    "%% complexType Schema Component Constraints",nl];
-comment("elem",_) ->
-    ["%% 3.3.2 XML Representation of Element Declaration.",nl,
-     "%% 3.3.4 Element Declaration Validation Rules.",nl,
-     "%% element Validation checking.",nl,
-     "%% Regular Expression Validation checking.",nl,
-     "%% Bug Regressions Specs section: 3.3.4",nl];
-comment("group",_) ->
-    ["%% Syntax Checking Model Group Tests.",nl,
-     "%% Content Checking Model Group Tests.",nl];
-comment("idc_",_) ->
-    ["%% 3.11.1 The Identity-constraint Definition Schema Component.",nl];
-comment("id",_) ->
-    ["%% Identity-constraint Definition Schema Component.",nl,
-     "%% Identity-constraint Validation Rules.",nl,
-     "%% Selector identity-constraint xpath bnf.",nl,
-     "%% Field identity-constraint xpath bnf.",nl,
-     "%% XPath validation.",nl,
-     "%% Bug Regressions",nl];
-comment("mgABCD",_) ->
-    ["%% model groups (ALL).",nl];
-comment("mgEFG",_) ->
-    ["%% model groups ( sequence ).",nl];
-comment("mgHIJ",_) ->
-    ["%% model groups ( choice ).",nl];
-comment("mgK",_) ->
-    ["%% model group validation checking (sequence).",nl];
-comment("mgLM",_) ->
-    ["%% model group validation checking (choice, all).",nl];
-comment("mgN",_) ->
-    ["%% Element Sequence Valid.",nl];
-comment("mgOP",_) ->
-    ["%% All Group Limited.",nl];
-comment("mgQR",_) ->
-    ["%% Element Declarations Consistent, 3.8.6",nl];
-comment("mgS",_) ->
-    ["%% Deterministic Sequences.",nl];
-comment("particlesAB",_) ->
-    ["%% 3.9.1 The Particle Schema Component.",nl];
-comment("particlesCDE",_) ->
-    ["%% 3.9.4 Particle Validation Rules: Element Sequence Locally Valid.",nl];
-comment("particlesFHI",_) ->
-    ["%% 3.9.6 Schema Component Constraint: Particle ....",nl];
-comment("particlesJ",_) ->
-    ["%% 3.9.6 Particle Derivation.",nl];
-comment("particlesKOSRTQUVW",_) ->
-    ["%% 3.9.6 Particle Restriction.",nl];
-comment("stABCDE",_) ->
-    ["%% Syntax Checking for simpleType Declaration.",nl];
-comment("stFGH",_) ->
-    ["%% simpleType Validation checking.",nl];
-comment("stIJK",_) ->
-    ["%% simpleType Schema Component Constraints.",nl];
-comment("stZ",_) ->
-    ["%% Bug Regressions.",nl];
-comment("wildABCDEF",_) ->
-    ["%% Syntax Validation - any.",nl];
-comment("wildGHI",_) ->
-    ["%% 3.10.4 Wildcard Validation Rules - any.",nl];
-comment("wildJKLMNQOP",_) ->
-    ["%% Syntax Validation - anyAttribute.",nl];
-comment("wildZ",_) ->
-    ["%% Bugs - Wildcards.",nl];
-comment("NISTSchema-anyURI",_) ->
-    ["%% Data type derived by restriction of anyURI by facets",nl];
-comment("NISTSchema-base64Binary",_) ->
-    ["%% Data type derived by restriction of base64binary by facets",nl];
-comment("NISTSchema-boolean",_) ->
-    ["%% Data type derived by restriction of boolean by facets",nl];
-comment("NISTSchema-byte",_) ->
-    ["%% Data type derived by restriction of byte by facets",nl];
-comment("NISTSchema-date-",_) ->
-    ["%% Data type derived by restriction of date by facets",nl];
-comment("NISTSchema-dateTime",_) ->
-    ["%% Data type derived by restriction of dateTime by facets",nl];
-comment("NISTSchema-decimal",_) ->
-    ["%% Data type derived by restriction of decimal by facets",nl];
-comment("NISTSchema-double",_) ->
-    ["%% Data type derived by restriction of double by facets",nl];
-comment("NISTSchema-duration",_) ->
-    ["%% Data type derived by restriction of duration by facets",nl];
-comment("NISTSchema-float",_) ->
-    ["%% Data type derived by restriction of float by facets",nl];
-comment("NISTSchema-gDay",_) ->
-    ["%% Data type derived by restriction of gDay by facets",nl];
-comment("NISTSchema-gMonth-",_) ->
-    ["%% Data type derived by restriction of gMonth by facets",nl];
-comment("NISTSchema-gMonthDay",_) ->
-    ["%% Data type derived by restriction of gMonthDay by facets",nl];
-comment("NISTSchema-gYear-",_) ->
-    ["%% Data type derived by restriction of gYear by facets",nl];
-comment("NISTSchema-gYearMonth",_) ->
-    ["%% Data type derived by restriction of gYearMonth by facets",nl];
-comment("NISTSchema-hexBinary",_) ->
-    ["%% Data type derived by restriction of hexBinary by facets",nl];
-comment("NISTSchema-ID",_) ->
-    ["%% Data type derived by restriction of ID by facets",nl];
-comment("NISTSchema-int-",_) ->
-    ["%% Data type derived by restriction of int by facets",nl];
-comment("NISTSchema-integer",_) ->
-    ["%% Data type derived by restriction of integer by facets",nl];
-comment("NISTSchema-language",_) ->
-    ["%% Data type derived by restriction of language by facets",nl];
-comment("NISTSchema-long",_) ->
-    ["%% Data type derived by restriction of long by facets",nl];
-comment("NISTSchema-Name",_) ->
-    ["%% Data type derived by restriction of Name by facets",nl];
-comment("NISTSchema-NCName",_) ->
-    ["%% Data type derived by restriction of NCName by facets",nl];
-comment("NISTSchema-negativeInteger",_) ->
-    ["%% Data type derived by restriction of negativeInteger by facets",nl];
-comment("NISTSchema-NMTOKEN",_) ->
-    ["%% Data type derived by restriction of NMTOKEN by facets",nl];
-comment("NISTSchema-nonNegativeInteger",_) ->
-    ["%% Data type derived by restriction of nonNegativeInteger by facets",nl];
-comment("NISTSchema-nonPositiveInteger",_) ->
-    ["%% Data type derived by restriction of nonPositiveInteger by facets",nl];
-comment("NISTSchema-normalizedString",_) ->
-    ["%% Data type derived by restriction of normalizedString by facets",nl];
-comment("NISTSchema-positiveInteger",_) ->
-    ["%% Data type derived by restriction of positiveInteger by facets",nl];
-comment("NISTSchema-QName",_) ->
-    ["%% Data type derived by restriction of QName by facets",nl];
-comment("NISTSchema-short",_) ->
-    ["%% Data type derived by restriction of short by facets",nl];
-comment("NISTSchema-string",_) ->
-    ["%% Data type derived by restriction of string by facets",nl];
-comment("NISTSchema-time",_) ->
-    ["%% Data type derived by restriction of time by facets",nl];
-comment("NISTSchema-token",_) ->
-    ["%% Data type derived by restriction of token by facets",nl];
-comment("NISTSchema-unsignedByte",_) ->
-    ["%% Data type derived by restriction of unsignedByte by facets",nl];
-comment("NISTSchema-unsignedInt",_) ->
-    ["%% Data type derived by restriction of unsignedInt by facets",nl];
-comment("NISTSchema-unsignedLong",_) ->
-    ["%% Data type derived by restriction of unsignedLong by facets",nl];
-comment("NISTSchema-unsignedShort",_) ->
-    ["%% Data type derived by restriction of unsignedShort by facets",nl].    
-
-
-emit_schema_test(IO) ->
-    emit(IO,["schema_test(Config,FileName,XsdBase,Validity) ->",nl,
-	     indent(3),"{Ok,S} = xmerl_xsd:process_schema(",
-	     "filename:join([?config(data_dir,Config),FileName]),",nl,
-	     indent(25),
-	     "[{xsdbase,filename:join([?config(data_dir,Config),XsdBase])}]),",nl,
-	     indent(3),"case Validity of",nl,
-	     indent(6),valid ," when Ok == ok ->",nl,
-	     indent(9),"{{filename:basename(FileName),S#xsd_state.errors == []},S};", nl,
-	     indent(6),invalid," when Ok == error ->",nl,
-	     indent(9), "{{filename:basename(FileName),true},S};",nl,
-	     indent(6),notKnown," ->",nl,
-	     indent(9),"{{filename:basename(FileName),true},S};",nl,
-	     indent(6),"_ -> {{filename:basename(FileName),false},S}",nl,
-	     indent(3),"end.",nl]),
-    emit(IO,["schema_test(Config,FileName,XsdBase,Validity,AccState) ->",nl,
-	     indent(3),"{Ok,S2} = xmerl_xsd:process_schema(",
-	     "filename:join([?config(data_dir,Config),FileName]),",nl,
-	     indent(25),
-	     "[{xsdbase,filename:join([?config(data_dir,Config),XsdBase])}, AccState]),",nl,
-	     indent(3),"case Validity of",nl,
-	     indent(6),valid," when Ok == ok ->",nl,
-	     indent(9),"{{filename:basename(FileName),S2#xsd_state.errors == []},S2};", nl,
-	     indent(6),invalid," when Ok == error ->",nl,
-	     indent(9), "{{filename:basename(FileName),true},S2};",nl,
-	     indent(6),notKnown," ->",nl,
-	     indent(9),"{{filename:basename(FileName),true},S2};",nl,
-	     indent(6),"_ -> {{filename:basename(FileName),false},S2}",nl,
-	     indent(3),"end.",nl]).
-
-emit_instance_test(IO) ->
-    emit(IO,["instance_test(Config,FileName,XMLBase,Validity,State) ->",nl]),    
-    emit(IO,[indent(3),"{E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),FileName]),",nl,
-	     indent(19),"[{xmlbase,filename:join([?config(data_dir,Config),",nl,
-	     indent(19),"XMLBase])}]),",nl]),
-    emit(IO,[indent(3),"{VE,S2} = xmerl_xsd:validate(E,[{state,State}]),",nl]),
-    emit(IO,[indent(3),"case Validity of",nl,
-	     indent(6),"valid when is_record(VE,xmlElement) ->",nl,
-	     indent(9),"{filename:basename(FileName),S2#xsd_state.errors == []};",nl,
-	     indent(6),"invalid when VE == error ->",nl,
-	     indent(9),"{filename:basename(FileName),true};",nl,
-	     indent(6),"notKnown ->",nl,
-	     indent(9),"{filename:basename(FileName),true};",nl,
-	     indent(6),"_ ->",nl,
-	     indent(9),"{filename:basename(FileName),false}",nl,
-	     indent(3),"end.",nl]).
-%%     emit(IO,[indent(3),"{VE,_} = xmerl_xsd:validate(E,[{state,State}]),",nl]),
-%%     emit(IO,[indent(3),"{filename:basename(FileName),VE == ExpectedRetVal}."]).
-
-exclude_case(_Suite,[]) ->
-    false;
-exclude_case(Suite,[#xmlAttribute{value=Name}]) ->
-    exlude_case(Suite,Name).
-
-exlude_case(msx,Case) ->
-    lists:member(Case,["attC002","mgS002","mgS003","mgS004","mgS005"]);
-exlude_case(_,_) ->
-    false.
diff --git a/lib/xmerl/test/proprietary/mylib.erl b/lib/xmerl/test/proprietary/mylib.erl
deleted file mode 100644
index 2e154a5e5f..0000000000
--- a/lib/xmerl/test/proprietary/mylib.erl
+++ /dev/null
@@ -1,54 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : mylib.erl
-%%% Author  : Bertil Karlsson <bertil@finrod>
-%%% Description : 
-%%%
-%%% Created : 20 Sep 2006 by Bertil Karlsson <bertil@finrod>
-%%%-------------------------------------------------------------------
--module(mylib).
--export([fetch/2,path_locate/3]).
--include("xmerl_xsd.hrl").
--include("xmerl.hrl").
--include_lib("kernel/include/file.hrl").
-
-fetch(URI,S) ->
-    Split = filename:split(URI),
-    Filename = fun([])->[];(X)->lists:last(X) end (Split),
-    Fullname = 
-	case Split of %% how about Windows systems?
-	    ["file:"|Name]-> %% absolute path, see RFC2396 sect 3
-		%% file:/dtd_name 
-		filename:join(["/"|Name]);
-	    ["/"|Rest] when Rest /= [] ->
-		%% absolute path name
-		URI;
-	    ["http:"|_Rest] ->
-		{http,URI};
-	    [] -> %% empty systemliteral
-		[];
-	    _ ->
-		filename:join(S#xsd_state.xsd_base, URI)
-	end,
-    Path = ?MODULE:path_locate(S#xsd_state.fetch_path, Filename, Fullname),
-    {ok, Path, S}.
-
-path_locate(_, _, {http,URI}) ->
-    application:start(inets),
-    http:set_options([{proxy, {{"www-proxy.ericsson.se", 8080},["localhost"]}}]),
-    {ok,{{_Version, 200, _ReasonPhrase}, _Headers, Body}} =
-	http:request(get, {URI, []}, [], []),
-    {string,Body};
-path_locate(_, _, []) ->
-    [];
-path_locate([Dir|Dirs], FN, FullName) ->
-    F = filename:join(Dir, FN),
-    case file:read_file_info(F) of
-	{ok, #file_info{type = regular}} ->
-	    {file,F};
-	_ ->
-	    path_locate(Dirs, FN, FullName)
-    end;
-path_locate([], _FN, FullName) ->
-    {file,FullName}.
-
-
diff --git a/lib/xmerl/test/test_xmerl.erl b/lib/xmerl/test/test_xmerl.erl
deleted file mode 100644
index d2c5d35a85..0000000000
--- a/lib/xmerl/test/test_xmerl.erl
+++ /dev/null
@@ -1,329 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% File    : test_xmerl.erl
-%%% Author  : Bertil Karlsson <bertil@finrod>
-%%% Description : 
-%%%
-%%% Created :  2 Dec 2003 by Bertil Karlsson <bertil@finrod>
-%%%-------------------------------------------------------------------
--module(test_xmerl).
-
--compile(export_all).
-
--define(xmerl_test_root,"/ldisk/xml/xml-test-suite/xmlconf").
--define(jclark_subdir,"/ldisk/xml/xml-test-suite/xmlconf/xmltest").
--define(sun_subdir,"/ldisk/xml/xml-test-suite/xmlconf/sun").
--define(xerox_subdir,"/ldisk/xml/xml-test-suite/xmlconf/japanese").
--define(oasis_subdir,"/ldisk/xml/xml-test-suite/xmlconf/oasis").
--define(ibm_subdir,"/ldisk/xml/xml-test-suite/xmlconf/ibm").
-
-
-get_xmlconf() ->
-    FileName = filename:join(?xmerl_test_root,"xmlconf.xml"),
-    {ok,L} = read_file(FileName),
-    L.
-
-read_file(FileName) ->
-    case file:read_file(FileName) of
-	{ok,Binary} ->
-	    {ok,binary_to_list(Binary)};
-	Err ->
-	    exit({error,Err})
-    end.
-
-get_file(F="sun"++_Rest) ->
-    get_sun_xml(F);
-get_file(F="jclark-xmltest") ->
-    get_jclark_xml(F);
-get_file(F="xerox-japanese") ->
-    get_xerox_xml(F);
-get_file(F="nist-oasis") ->
-    get_oasis_xml(F);
-get_file("ibm-"++Rest) ->
-    get_ibm_xml(Rest).
-  
-
-get_sun_xml(F) ->
-    FileName = filename:join([?sun_subdir,F++".xml"]),
-    {ok,L} = read_file(FileName),
-    L.
-get_jclark_xml(_F) ->
-    FileName = filename:join([?jclark_subdir,"xmltest.xml"]),
-    {ok,L} = read_file(FileName),
-    L.
-get_xerox_xml(_F) ->
-    FileName = filename:join([?xerox_subdir,"japanese.xml"]),
-    {ok,L} = read_file(FileName),
-    L.
-get_oasis_xml(_F) ->
-    FileName = filename:join([?oasis_subdir,"oasis.xml"]),
-    {ok,L} = read_file(FileName),
-    L.
-get_ibm_xml(F) ->
-    FileName = filename:join([?ibm_subdir,"ibm_oasis_"++F++".xml"]),
-    {ok,L} = read_file(FileName),
-    L.
-
-%% The generated xml file must have a unique name: concatenate the 
-%% sub directory name and the ID of the TEST tag.
-%% In each file the start of xmlconf.xml is included. Then a TEST
-%% follows. It must be properly finished with end tags.
-extract_TESTSUITEs() ->
-    TestSuites = ["sun-valid","sun-invalid","sun-not-wf","sun-error",
-		 "jclark-xmltest","xerox-japanese","nist-oasis",
-		 "ibm-invalid","ibm-not-wf","ibm-valid"],
-    Pid=spawn_link(?MODULE,ticker,[]),
-    lists:foreach(fun extract_TESTCASES/1,TestSuites),
-    generate_testfuncs(),
-    xmerl_ticker ! finished.
-
-extract_TESTCASES(Suite) ->
-%    io:format("extract_TESTCASES:1~n",[]),
-    L = get_file(Suite), % fetch xml file in sub directory
-%    io:format("Reading Suite: ~p~n",[Suite]),
-    Prol = xmlconf_prolog(),
-%    io:format("Reading xmlconf.xml~n",[]),
-    xmerl_ticker ! {suite,Suite},
-    extract_TESTs(Suite,L,Prol,[]).
-
-extract_TESTs(Suite,TCfile,Prol,TCAcc) ->
-    case find_start_tag(Suite,TCfile,[],TCAcc) of
-	{[],_,_,_} -> ok;
-%%	    print_filenames();
-	{T,Rest,TC,ID} ->
-	    generate_TEST(Suite,ID,Prol,TC,T),
-	    extract_TESTs(Suite,Rest,Prol,TC)
-%	    file_output("out.xml",L1)
-    end.
-
-generate_TEST(Suite,ID,Prolog,TC,T) ->
-%    GenDir = filename:join(["test",sub_dir(Suite)]),
-    GenDir = sub_dir(Suite),
-    Extension = extension(Suite),
-%    Filename = filename:join([GenDir,ID ++ Extension]),
-    Filename = mk_filename(Suite,GenDir,ID ++ Extension),
-    save_filename(Suite,ID),
-    {ok,IOF}=file:open(Filename,[write]),
-    TSEnding = testsuite_end(),
-    TCEnding = testcases_end(length(TC)),
-    file:write(IOF,Prolog ++ "\n\n" ++ TC ++ "\n\n" ++ T ++ "\n\n" ++
-	       TCEnding++ "\n\n" ++ TSEnding),
-    file:close(IOF).
-
-save_filename("xerox-japanese",Name) ->
-    NewName = "japanese-"++Name,
-    save_filename1(NewName);
-save_filename(_,Name) ->
-    save_filename1(Name).
-
-save_filename1(Name) ->
-    Saves = case get(filenames) of
-		undefined ->
-		    [];
-		L -> L
-	    end,
-    put(filenames,[Name|Saves]).
-
-generate_testfuncs() ->
-    Filenames = get(filenames),
-    Res = (catch generate_testfuncs(lists:reverse(Filenames))),
-    io:format("~p~n",[Res]).
-generate_testfuncs(Filenames) ->
-    file:delete(testfuncs.erl),
-    {ok,IOF} = file:open(testfuncs.erl,[append]),
-    lists:foreach(fun(X) -> 
-			  RN = filename:rootname(X),
-			  TestDirPath = "filename:join([?config(data_dir,Config),"++xmerl_SUITE:testcase_dir(list_to_atom(RN)),
-			  file:write(IOF,"'"++RN++"'(suite) -> [];\n'"++RN++
-				     "'(Config) ->\n"++
-				     "  ?line file:set_cwd(?config(data_dir,Config)),\n"++
-				     "  ?line {A,_} = xmerl_scan:file("++
-				     TestDirPath++",\""++RN++".xml\"])"++
-				     ",[]),\n"++
-				     "  ?line C = xmerl:export([A],xmerl_test)."++
-				     "\n\n") end,Filenames),
-    file:close(IOF),
-    io:format("~ngenerated ~w testcases.erl.~n",[length(Filenames)]).
-
-print_filenames() ->
-    Filenames = get(filenames),
-    io:format("~n,~w files generated.~n[",[length(Filenames)]),
-    lists:foreach(fun(X) ->
-			  io:format("~p,",[list_to_atom(X)]) end,
-		  Filenames),
-    io:format("]~n"),
-    put(filenames,[]).
-
-
-mk_filename("xerox-japanese",GenDir,Name) ->
-    filename:join([GenDir,"japanese-"++Name]);
-mk_filename(_,GenDir,Name) ->
-    filename:join([GenDir,Name]).
-
-file_output(Filename,Content) ->
-    {ok,IOF}=file:open(Filename,[write]),
-    C1 = xmlconf_prolog(),
-    C2 = xmlconf_end(),
-    file:write(IOF,C1 ++ "\n\n" ++ Content ++ "\n\n" ++ C2),
-    file:close(IOF).
-		       
-
-find_start_tag(Suite,"<TESTCASES"++Rest,TAcc,TCAcc) ->
-    {L,Rest2}=parse_until_end_TCs_skip_base(Rest,[]),
-    find_start_tag(Suite,Rest2,TAcc,["<TESTCASES"++L|TCAcc]);
-find_start_tag(Suite,"</TESTCASES>"++Rest,TAcc,[H|T]) ->
-    find_start_tag(Suite,Rest,TAcc,T);
-find_start_tag(Suite,"<TEST"++Rest,TAcc,TCAcc) ->
-    Id = extract_ID(Rest),
-    {L,Rest2} = parse_until_end_T(Suite,Rest,[]),
-    {"<TEST" ++ L,Rest2,TCAcc,Id};
-find_start_tag(Suite,[H|T],TAcc,TCAcc) ->
-    find_start_tag(Suite,T,TAcc,TCAcc);
-find_start_tag(_,[],TAcc,TCAcc) -> % no more tests
-    {TAcc,[],TCAcc,[]}.
-
-parse_until_end_T(Suite,"URI"++Rest,Acc) ->
-    {Up2URI,Rest2}=parse_upto_URI_val(Suite,Rest,["URI"]),
-    parse_until_end_T(Suite,Rest2,[Up2URI|Acc]);
-% parse_until_end_T(Suite,"</TEST>"++Rest,Acc) ->
-%     {lists:flatten(lists:reverse(["</TEST>"|Acc])),Rest};
-parse_until_end_T(Suite,"OUTPUT"++Rest,Acc) ->
-    {Up2OUTPUT,Rest2}=parse_upto_URI_val(Suite,Rest,["OUTPUT"]),
-    parse_until_end_T(Suite,Rest2,[Up2OUTPUT|Acc]);
-parse_until_end_T(_Suite,"</TEST>"++Rest,Acc) ->
-    {lists:flatten(lists:reverse(["</TEST>"|Acc])),Rest};
-parse_until_end_T(Suite,[H|T],Acc) ->
-    parse_until_end_T(Suite,T,[H|Acc]);
-parse_until_end_T(_,[],Acc) ->
-    exit({error,{"unexpected end",lists:reverse(Acc)}}).
-
-parse_upto_URI_val(Suite,[H|Rest],Acc) when H==$\t;H==$\n;H==$\s ->
-    parse_upto_URI_val(Suite,Rest,[H|Acc]);
-parse_upto_URI_val(Suite,[H|Rest],Acc) when H/="=" ->
-    {lists:flatten(lists:reverse([H|Acc])),Rest};
-parse_upto_URI_val(Suite,[H|Rest],Acc) ->
-    parse_upto_URI_val2(Suite,Rest,[H|Acc]).
-
-parse_upto_URI_val2(Suite,[H|Rest],Acc) when H==$"; H==$' ->
-    SubDir = sub_dir(Suite),
-    {lists:flatten(lists:reverse([$/,SubDir,H|Acc])),Rest};
-parse_upto_URI_val2(Suite,[H|T],Acc) ->
-    parse_upto_URI_val2(Suite,T,[H|Acc]).
-
-parse_until_end_TCs_skip_base(">"++Rest,Acc) ->
-    {lists:flatten(lists:reverse(["\n",">"|Acc])),Rest};
-parse_until_end_TCs_skip_base("xml:base="++Rest,Acc) ->
-    Rest2=skip_base_def(Rest),
-    parse_until_end_TCs_skip_base(Rest2,Acc) ->
-parse_until_end_TCs_skip_base([H|T],Acc) ->
-    parse_until_end_TCs_skip_base(T,[H|Acc]).
-
-skip_base_def([Del|R]) ->
-    skip_base_def(R,Del).
-skip_base_def([Del|R],Del) ->
-    R;
-skip_base_def([_H|R],Del) ->
-    skip_base_def(R,Del).
-
-% parse_end_T("</TEST>"++Rest,Acc) ->
-%     {lists:flatten(lists:reverse(["</TEST>"|Acc])),Rest};
-% parse_end_T([H|T],Acc) ->
-%     parse_end_T(T,[H|Acc]).
-
-
-xmlconf_prolog() ->
-    FC = get_xmlconf(),
-    parse_xmlconf_prolog(FC,[]).
-
-
-%% 
-extract_ID("ID"++Rest) ->
-    extract_ID2(Rest);
-extract_ID([H|T]) ->
-    extract_ID(T).
-
-extract_ID2([H|Rest]) when H==$";H==$' ->
-    extract_IDval(Rest,[]);
-extract_ID2([H|T]) -> %skip '=' and white space
-    extract_ID2(T).
-
-extract_IDval([H|Rest],Acc) when H==$";H==$' ->
-    lists:flatten(lists:reverse(Acc));
-extract_IDval([H|T],Acc) ->
-    extract_IDval(T,[H|Acc]).
-
-    
-testsuite_end() ->
-    "</TESTSUITE>".
-
-testcases_end(0) ->
-    "";
-testcases_end(N) ->
-    "</TESTCASES>" ++ "\n" ++testcases_end(N-1).
-
-xmlconf_end() ->
-    "</TESTSUITE>".
-
-
-parse_xmlconf_prolog("href=\"xmlconformance.xsl\""++Rest,Acc) ->
-    HRef = lists:reverse("href=\"../../xmlconformance.xsl\""),
-    parse_xmlconf_prolog(Rest,HRef++Acc);
-parse_xmlconf_prolog("<!DOCTYPE TESTSUITE SYSTEM \"testcases.dtd\""++Rest,Acc) -> 
-    Rest2 = skip_entity_defs(Rest),
-    DocType = lists:reverse("<!DOCTYPE TESTSUITE SYSTEM \"../../testcases.dtd\">"),
-    parse_xmlconf_prolog(Rest2,DocType++Acc);
-parse_xmlconf_prolog("<TESTSUITE"++Rest,Acc) ->
-    Acc2 = parse_until_TESTSUITE_tag(Rest,[]),
-    lists:flatten(lists:reverse([Acc2,"<TESTSUITE"|Acc]));
-parse_xmlconf_prolog([H|T],Acc) ->
-    parse_xmlconf_prolog(T,[H|Acc]);
-parse_xmlconf_prolog([],Acc) ->
-    exit({error,{"unexpected end",lists:reverse(Acc)}}).
-
-parse_until_TESTSUITE_tag(">"++_Rest,Acc) ->
-    lists:flatten(lists:reverse([">"|Acc]));
-parse_until_TESTSUITE_tag([H|T],Acc) ->
-    parse_until_TESTSUITE_tag(T,[H|Acc]);
-parse_until_TESTSUITE_tag([],Acc) ->
-    exit({error,{"unexpected end",lists:reverse(Acc)}}).
-
-skip_entity_defs("]>"++Rest) ->
-    Rest;
-skip_entity_defs([H|T]) ->
-    skip_entity_defs(T).
-    
-sub_dir("jclark-xmltest") ->
-    "xmerl_SUITE_data/xmltest";
-sub_dir("xerox-japanese") ->
-    "xmerl_SUITE_data/japanese";
-sub_dir("sun"++_Rest) ->
-    "xmerl_SUITE_data/sun";
-sub_dir("nist-oasis") ->
-    "xmerl_SUITE_data/oasis";
-sub_dir("ibm"++_Rest) ->
-    "xmerl_SUITE_data/ibm".
-
-extension("ibm"++_R) ->
-    "";
-extension(_) ->
-    ".xml".
-
-%*****************************
-ticker() ->
-    register(xmerl_ticker,self()),
-    receive
-	{suite,Name} ->
-	    io:format("~nGenerating suite ~p",[Name])
-    end,
-    ticker_loop().
-
-ticker_loop() ->
-    receive
-	{suite,Name} ->
-	    io:format("~nGenerating suite ~p",[Name]),
-	    ticker_loop();
-	finished ->
-	    ok
-    after 400 ->
-%	    io:format(".",[]),
-	    ticker_loop()
-    end.
diff --git a/lib/xmerl/test/xmerl_SUITE.erl b/lib/xmerl/test/xmerl_SUITE.erl
index 2061c32b3f..9b65232fe7 100644
--- a/lib/xmerl/test/xmerl_SUITE.erl
+++ b/lib/xmerl/test/xmerl_SUITE.erl
@@ -265,37 +265,278 @@ testXSEIF(Config) ->
 
 export_simple1(suite) -> [];
 export_simple1(Config) ->
-    ?line ok = xmerl_test_lib:export_simple1(Config).
+    Simple = simple(),
+    Res = xmerl:export_simple(Simple,xmerl_xml,[{title, "Doc Title"}]),
+    ?line "<?xml version="++_ = lists:flatten(Res),
+
+    %% Use of fun in simple content OTP-6679
+    Simple2 = simple2(),
+    Res2 = xmerl:export_simple(Simple2,xmerl_xml,[{title,"Doc Title"}]),
+    ?line true = (Res2 =:= Res),
+    ok.
 
 export(suite) -> [];
 export(Config) ->
-    ?line ok = xmerl_test_lib:export(Config).
+    DataDir = ?config(data_dir,Config),
+    Prolog = ["<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<!DOCTYPE motorcycles SYSTEM \"motorcycles.dtd\">\n"],
+    TestFile = filename:join([DataDir,"misc","motorcycles.xml"]),
+    ?line {E,_} = xmerl_scan:file(TestFile),
+    ?line Exported = xmerl:export([E],xmerl_xml,[{prolog,Prolog}]),
+    B = list_to_binary(Exported++"\n"),
+    ?line {ok,B} = file:read_file(TestFile),
+    ok.
 
 %%----------------------------------------------------------------------
 
 sax_parse_and_export(suite) -> [];
 sax_parse_and_export(Config) ->
-    ?line ok = xmerl_test_lib:sax_parse_export_xml_big(Config),
-    ?line ok = xmerl_test_lib:sax_parse_export_xml_small(Config).
+    ?line ok = sax_parse_export_xml_big(Config),
+    ?line ok = sax_parse_export_xml_small(Config).
 
 %%----------------------------------------------------------------------
 
+sax_parse_export_xml_big(Config) ->
+    DataDir = ?config(data_dir,Config),
+    OutDir = ?config(priv_dir,Config),
+    io:format("DataDir: ~p~n,OutDir:~p~n",[DataDir,OutDir]),
+    CMOMxml = filename:join([DataDir,"eventp","CMOM.xml"]),
+    ?line {Ex,[]} = xmerl_eventp:file_sax(CMOMxml, xmerl_xml,[],[]),
+    OutFile = filename:join([OutDir,"cmom"]),
+    file:delete(OutFile),
+    StubFile = filename:join([DataDir,"eventp","CelloMOM.stub"]),
+    ?line {ok,Bin} = file:read_file(StubFile),
+    ?line {ok,IO} = file:open(OutFile,[write,append]),
+    ?line ok = file:write(IO,Bin),
+    ?line ok = io:format(IO,"~s~n~n",[lists:flatten(Ex)]),
+    Cmd = lists:flatten(io_lib:format("cmp ~s ~s",[OutFile,CMOMxml])),
+    ?line [] = os:cmd(Cmd),
+    ok.
+
+sax_parse_export_xml_small(Config) ->
+    DataDir = ?config(data_dir,Config),
+    OutDir = ?config(priv_dir,Config),
+    Wurfl_xml = filename:join([DataDir,"eventp","wurfl.xml"]),
+    ?line {Ex,[]} = xmerl_eventp:file_sax(Wurfl_xml, xmerl_xml,[],[]),
+    OutFile = filename:join([OutDir,"wrfl"]),
+    file:delete(OutFile),
+    StubFile = filename:join([DataDir,"eventp","wurfl.stub"]),
+    ?line {ok,Bin} = file:read_file(StubFile),
+    ?line {ok,IO} = file:open(OutFile,[write,append]),
+    ?line ok = file:write(IO,Bin),
+    ?line ok = io:format(IO,"~s~n",[lists:flatten(Ex)]),
+    Cmd = lists:flatten(io_lib:format("cmp ~s ~s",[OutFile,Wurfl_xml])),
+    ?line [] = os:cmd(Cmd),
+    ok.
+
+
+simple() ->
+    [{document, 
+      [{title, "Doc Title"}, {author, "Ulf Wiger"}],
+      [{section, 
+	[{heading, "heading1"}],
+	[{'P', ["This is a paragraph of text."]},
+	 {section, 
+	  [{heading, "heading2"}],
+	  [{'P', ["This is another paragraph."]},
+	   {table, 
+	    [{border, 1}],
+	    [{heading,
+	      [{col, ["head1"]},
+	       {col, ["head2"]}]},
+	     {row,
+	      [{col, ["col11"]},
+	       {col, ["col12"]}]},
+	     {row,
+	      [{col, ["col21"]},
+	       {col, ["col22"]}]}]}]}]}]}].
+
+
+simple2() ->
+    GenC = fun ?MODULE:generate_section/1,
+    GenA = fun ?MODULE:generate_attr_title/1,
+    [{document,[{GenA,2}],[{GenC,1}]}].
+
+generate_attr_title(0) ->
+    done;
+generate_attr_title(1) ->
+    {{title,"Doc Title"},0};
+generate_attr_title(2) ->
+    {{author, "Ulf Wiger"},1}.
+generate_section(0) ->
+    done;
+generate_section(N) ->
+    GenC = fun ?MODULE:generate_section_content/1,
+    GenA = fun ?MODULE:generate_section_attribute/1,
+    {{section,[{GenA,1}],[{GenC,2}]},N-1}.
+
+generate_section_attribute(0) ->
+    done;
+generate_section_attribute(N) ->
+    {{heading, "heading1"},N-1}.
+
+    
+generate_subsection_content(0) ->
+    done;
+generate_subsection_content(1) ->
+    {{'P',["This is another paragraph."]},0};
+generate_subsection_content(N) ->
+    {{table,[{fun ?MODULE:generate_border_attribute/1,1}],
+      [{fun ?MODULE:generate_table_content/1,2}]},N-1}.
+generate_section_content(0) ->
+    done;
+generate_section_content(1) ->
+    {{'P',["This is a paragraph of text."]},0};
+generate_section_content(N) ->
+    {{section,[{heading,"heading2"}],
+      [{fun ?MODULE:generate_subsection_content/1,2}]},N-1}.
+generate_border_attribute(0) ->
+    done;
+generate_border_attribute(N) ->
+    {{border,N},N-1}.
+generate_table_content(0) ->
+    done;
+generate_table_content(1) ->
+    {{fun ?MODULE:generate_heading/1,1},0};
+generate_table_content(N) ->
+    {{fun ?MODULE:generate_row/1, {2,2}},N-1}.
+generate_row({0,_}) ->
+    done;
+generate_row(N) ->
+    UpdateS = fun({2,_}) -> {1,2};(_) -> {0,0} end,
+    {{row,[{fun ?MODULE:generate_row_col/1, N}]},UpdateS(N)}.
+generate_row_col({_,0}) ->
+    done;
+generate_row_col(N={C,R}) ->
+    UpdateS = fun({X,Y}) -> {X,Y-1} end,
+    {{col,[lists:concat(["col",C,R])]},UpdateS(N)}.
+generate_heading(0) ->
+    done;
+generate_heading(N) ->
+    {{heading,[{fun ?MODULE:generate_heading_col/1,2}]},N-1}.
+generate_heading_col(0) ->
+    done;
+generate_heading_col(N) ->
+    {{col,[lists:concat(["head",N])]},N-1}.
+
+%%----------------------------------------------------------------------
+%% Ticket Tests
+%%----------------------------------------------------------------------
+
+%%
+%% ticket_5998
+%%
+%% A Kleene Closure child in a sequence consumed all following
+%% childs. This problem has been fixed.
+%%
 ticket_5998(suite) -> [];
 ticket_5998(Config) ->
-    ?line ok = xmerl_test_lib:ticket_5998(Config).
+    DataDir = ?config(data_dir,Config),
+    %% First fix is tested by case syntax_bug2.
+    
+    ?line case catch xmerl_scan:file(filename:join([DataDir,misc,
+						    "ticket_5998_2.xml"])) of
+	      {'EXIT',{fatal,Reason1}} ->
+		  case Reason1 of
+		      {{endtag_does_not_match,
+			{was,obj,should_have_been,int}},
+		       _,_,_} -> ok;
+		      _ -> {comment,"parsing changed behaviour"}
+		  end
+	  end,
+
+    ?line case catch xmerl_scan:file(filename:join([DataDir,misc,
+						    "ticket_5998_3.xml"])) of
+	      {'EXIT',{fatal,Reason2}} ->
+		  case Reason2 of
+		      {"expected one of: ?>, standalone, encoding",
+		       _,_,_} -> ok;
+		      _ -> {comment,"parsing changed behaviour"}
+		  end
+	  end.    
+
 
+%%
+%% ticket_7211
+%%
+%% A Kleene Closure child in a sequence consumed all following
+%% childs. This problem has been fixed.
+%%
 ticket_7211(suite) -> [];
 ticket_7211(Config) ->
-    ?line ok = xmerl_test_lib:ticket_7211(Config).
+    DataDir = ?config(data_dir,Config),
+    ?line {E,[]} = 
+	xmerl_scan:file(filename:join([DataDir,misc,"notes2.xml"]),
+			[{fetch_path,[filename:join([DataDir,misc,erlang_docs_dtd])]},
+			 {validation,dtd}]),
+    
+    ?line ok = case E of
+		   Rec when is_record(Rec,xmlElement) ->
+		       ok;
+		   _ ->
+		       E
+	       end,
+		       
+    ?line {E2,[]} = 
+	xmerl_scan:file(filename:join([DataDir,misc,"XS.xml"]),
+			[{fetch_path,[filename:join([DataDir,misc,erlang_docs_dtd])]},
+			 {validation,dtd}]),
+    
+    ?line ok = case E2 of
+		   Rec2 when is_record(Rec2,xmlElement) ->
+		       ok;
+		   _ ->
+		       E2
+	       end.
 
+%%
+%% ticket_7214
+%%
+%% Now validating xhtml1-transitional.dtd.
+%% A certain contentspec with a succeding choice, that didn't match
+%% all content, followed by other child elements caused a
+%% failure. This is now corrected.
+%%
 ticket_7214(suite) -> [];
 ticket_7214(Config) ->
-    ?line ok = xmerl_test_lib:ticket_7214(Config).
+    DataDir = ?config(data_dir,Config),
 
+    ?line {E,[]} = 
+	xmerl_scan:file(filename:join([DataDir,misc,'block_tags.html']),
+			[{validation,dtd},
+			 {fetch_path,[filename:join([DataDir,misc,erlang_docs_dtd])]}]),
+    
+    ?line ok = case E of
+		   Rec when is_record(Rec,xmlElement) ->
+		       ok;
+		   _ ->
+		       E
+	       end.
 
+%%
+%% ticket_7430
+%%
+%% Problem with contents of numeric character references followed by 
+%% UTF-8 characters..
+%%
 ticket_7430(suite) -> [];
 ticket_7430(Config) ->
-    ?line ok = xmerl_test_lib:ticket_7430(Config).
+    DataDir = ?config(data_dir,Config),
+
+    ?line {E,[]} = 
+	xmerl_scan:string("<a>\303\251&#xD;\303\251</a>",
+			  [{encoding, 'utf-8'}]),
+
+    ?line ok = case E of
+		   {xmlElement,a,a,[],
+		    {xmlNamespace,[],[]},
+		    [],1,[],
+		    [{xmlText,[{a,1}],1,[],"�",text},
+		     {xmlText,[{a,1}],2,[],"\n�",text}],
+		    [],_,undeclared} ->
+		       ok;
+		   _ ->
+		       E
+	       end.
 
 ticket_6873(suite) -> [];
 ticket_6873(Config) ->
@@ -334,11 +575,6 @@ ticket_8697(Config) ->
     ?line [16#545C] = HexEntityText,
     ok.
 
-%%----------------------------------------------------------------------
-
-% app_test(Config) ->
-%     ?line xmerl_app_test:app().
-
 
 
 
diff --git a/lib/xmerl/test/xmerl_appup_test.erl b/lib/xmerl/test/xmerl_appup_test.erl
index c1b1bfe78d..88d4a9bc28 100644
--- a/lib/xmerl/test/xmerl_appup_test.erl
+++ b/lib/xmerl/test/xmerl_appup_test.erl
@@ -181,7 +181,7 @@ check_instruction(down, {add_module, Module}, _, Modules)
 	{error, {unknown_module, Module, Modules}} ->
 	    ok;
 	ok ->
-	    error({existing_readded_module, Module})
+	    local_error({existing_readded_module, Module})
     end;
 
 %% Removing a module on upgrade: 
@@ -198,7 +198,7 @@ check_instruction(up, {remove, {Module, Pre, Post}}, _, Modules)
 	    check_purge(Pre),
 	    check_purge(Post);
 	ok ->
-	    error({existing_removed_module, Module})
+	    local_error({existing_removed_module, Module})
     end;
 
 %% Removing a module on downgrade: the module exist
@@ -215,7 +215,7 @@ check_instruction(down, {remove, {Module, Pre, Post}}, AllInstr, Modules)
 	    check_purge(Post),
 	    check_no_remove_depends(Module, AllInstr);
 	{error, {unknown_module, Module, Modules}} ->
-	    error({nonexisting_removed_module, Module})
+	    local_error({nonexisting_removed_module, Module})
     end;
 
 check_instruction(_, {load_module, Module, Pre, Post, Depend}, 
@@ -251,7 +251,7 @@ check_instruction(_, {update, Module, Change, Pre, Post, Depend},
 check_instruction(_, Instr, _AllInstr, _Modules) ->
     d("check_instruction -> entry when unknown instruction with"
       "~n   Instr: ~p", [Instr]),
-    error({error, {unknown_instruction, Instr}}).
+    local_error({error, {unknown_instruction, Instr}}).
 
 
 %% If Module X depends on Module Y, then module Y must have an update
@@ -279,14 +279,14 @@ instruction_module({update, Module, _, _, _, _}) ->
 instruction_module(Instr) ->
     d("instruction_module -> entry when unknown instruction with"
       "~n   Instr: ~p", [Instr]),
-    error({error, {unknown_instruction, Instr}}).
+    local_error({error, {unknown_instruction, Instr}}).
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 check_version(V) when is_list(V) ->
     ok;
 check_version(V) ->
-    error({bad_version, V}).
+    local_error({bad_version, V}).
 
 
 check_module(M, Modules) when is_atom(M) ->
@@ -294,10 +294,10 @@ check_module(M, Modules) when is_atom(M) ->
         true ->
             ok;
         false ->
-            error({unknown_module, M, Modules})
+            local_error({unknown_module, M, Modules})
     end;
 check_module(M, _) ->
-    error({bad_module, M}).
+    local_error({bad_module, M}).
 
 
 check_module_depend(M, [], _) when is_atom(M) ->
@@ -313,12 +313,12 @@ check_module_depend(M, Deps, Modules) when is_atom(M), is_list(Deps) ->
         [] ->
             ok;
         Unknown ->
-            error({unknown_depend_modules, Unknown})
+            local_error({unknown_depend_modules, Unknown})
     end;
 check_module_depend(_M, D, _Modules) ->
     d("check_module_depend -> entry when bad depend with"
       "~n   D: ~p", [D]),    
-    error({bad_depend, D}).
+    local_error({bad_depend, D}).
 
 
 check_no_remove_depends(_Module, []) ->
@@ -330,14 +330,14 @@ check_no_remove_depends(Module, [Instr|Instrs]) ->
 check_no_remove_depend(Module, {load_module, Mod, _Pre, _Post, Depend}) ->
     case lists:member(Module, Depend) of
 	true ->
-	    error({removed_module_in_depend, load_module, Mod, Module});
+	    local_error({removed_module_in_depend, load_module, Mod, Module});
 	false ->
 	    ok
     end;
 check_no_remove_depend(Module, {update, Mod, _Change, _Pre, _Post, Depend}) ->
     case lists:member(Module, Depend) of
 	true ->
-	    error({removed_module_in_depend, update, Mod, Module});
+	    local_error({removed_module_in_depend, update, Mod, Module});
 	false ->
 	    ok
     end;
@@ -350,7 +350,7 @@ check_change(soft) ->
 check_change({advanced, _Something}) ->
     ok;
 check_change(Change) ->
-    error({bad_change, Change}).
+    local_error({bad_change, Change}).
 
 
 check_purge(soft_purge) ->
@@ -358,13 +358,13 @@ check_purge(soft_purge) ->
 check_purge(brutal_purge) ->
     ok;
 check_purge(Purge) ->
-    error({bad_purge, Purge}).
+    local_error({bad_purge, Purge}).
 
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-error(Reason) ->
+local_error(Reason) ->
     throw({error, Reason}).
 
 fail(Reason) ->
diff --git a/lib/xmerl/test/xmerl_sax_std_SUITE.erl b/lib/xmerl/test/xmerl_sax_std_SUITE.erl
index f26438d500..2048cc384f 100644
--- a/lib/xmerl/test/xmerl_sax_std_SUITE.erl
+++ b/lib/xmerl/test/xmerl_sax_std_SUITE.erl
@@ -1,4 +1,4 @@
-%%-*-erlang-*-
+
 %%----------------------------------------------------------------------
 %% %CopyrightBegin%
 %% 
@@ -40,7 +40,7 @@
 init_per_suite(doc) ->
     ["Starts the test suite"];
 init_per_suite(Config) ->
-    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
     ?line ok=erl_tar:extract("ibm.tgz",[compressed]),
     ?line ok=erl_tar:extract("japanese.tgz",[compressed]),
     ?line ok=erl_tar:extract("oasis.tgz",[compressed]),
@@ -55,7 +55,7 @@ init_per_suite(Config) ->
 end_per_suite(doc) ->
     ["Stops the test suite"];
 end_per_suite(Config) ->
-    ?line file:set_cwd(?config(data_dir,Config)),
+    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
     ?line ok=rm_files(["ibm","japanese","oasis","sun","xmltest"]),
     Config.
  
@@ -95,8 +95,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [41]
 'not-wf-sa-001'(suite) -> [];
 'not-wf-sa-001'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/001.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/001.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -108,8 +108,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [4]
 'not-wf-sa-002'(suite) -> [];
 'not-wf-sa-002'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/002.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/002.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -121,8 +121,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [16]
 'not-wf-sa-003'(suite) -> [];
 'not-wf-sa-003'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/003.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/003.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -134,8 +134,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [16]
 'not-wf-sa-004'(suite) -> [];
 'not-wf-sa-004'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/004.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/004.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -147,8 +147,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [16]
 'not-wf-sa-005'(suite) -> [];
 'not-wf-sa-005'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/005.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/005.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -160,8 +160,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5 [16]
 'not-wf-sa-006'(suite) -> [];
 'not-wf-sa-006'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/006.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/006.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -173,8 +173,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'not-wf-sa-007'(suite) -> [];
 'not-wf-sa-007'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/007.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/007.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -186,8 +186,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [5]
 'not-wf-sa-008'(suite) -> [];
 'not-wf-sa-008'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/008.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/008.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -199,8 +199,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'not-wf-sa-009'(suite) -> [];
 'not-wf-sa-009'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/009.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/009.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -212,8 +212,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'not-wf-sa-010'(suite) -> [];
 'not-wf-sa-010'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/010.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/010.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -225,8 +225,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [41]
 'not-wf-sa-011'(suite) -> [];
 'not-wf-sa-011'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/011.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/011.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -238,8 +238,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [10]
 'not-wf-sa-012'(suite) -> [];
 'not-wf-sa-012'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/012.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/012.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -251,8 +251,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [10]
 'not-wf-sa-013'(suite) -> [];
 'not-wf-sa-013'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/013.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/013.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -264,8 +264,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [10]
 'not-wf-sa-014'(suite) -> [];
 'not-wf-sa-014'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/014.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/014.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -277,8 +277,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [41]
 'not-wf-sa-015'(suite) -> [];
 'not-wf-sa-015'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/015.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/015.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -290,8 +290,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [41]
 'not-wf-sa-016'(suite) -> [];
 'not-wf-sa-016'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/016.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/016.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -303,8 +303,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7 [18]
 'not-wf-sa-017'(suite) -> [];
 'not-wf-sa-017'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/017.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/017.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -316,8 +316,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7 [19]
 'not-wf-sa-018'(suite) -> [];
 'not-wf-sa-018'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/018.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/018.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -329,8 +329,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [42]
 'not-wf-sa-019'(suite) -> [];
 'not-wf-sa-019'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/019.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/019.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -342,8 +342,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [10]
 'not-wf-sa-020'(suite) -> [];
 'not-wf-sa-020'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/020.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/020.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -355,8 +355,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [10]
 'not-wf-sa-021'(suite) -> [];
 'not-wf-sa-021'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/021.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/021.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -368,8 +368,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'not-wf-sa-022'(suite) -> [];
 'not-wf-sa-022'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/022.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/022.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -381,8 +381,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [5]
 'not-wf-sa-023'(suite) -> [];
 'not-wf-sa-023'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/023.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/023.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -394,8 +394,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [5]
 'not-wf-sa-024'(suite) -> [];
 'not-wf-sa-024'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/024.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/024.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -407,8 +407,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.4 [14]
 'not-wf-sa-025'(suite) -> [];
 'not-wf-sa-025'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/025.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/025.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -420,8 +420,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.4 [14]
 'not-wf-sa-026'(suite) -> [];
 'not-wf-sa-026'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/026.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/026.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -433,8 +433,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5 [15]
 'not-wf-sa-027'(suite) -> [];
 'not-wf-sa-027'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/027.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/027.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -446,8 +446,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [16]
 'not-wf-sa-028'(suite) -> [];
 'not-wf-sa-028'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/028.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/028.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -459,8 +459,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.4 [14]
 'not-wf-sa-029'(suite) -> [];
 'not-wf-sa-029'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/029.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/029.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -472,8 +472,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-030'(suite) -> [];
 'not-wf-sa-030'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/030.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/030.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -485,8 +485,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-031'(suite) -> [];
 'not-wf-sa-031'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/031.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/031.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -498,8 +498,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-032'(suite) -> [];
 'not-wf-sa-032'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/032.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/032.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -511,8 +511,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-033'(suite) -> [];
 'not-wf-sa-033'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/033.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/033.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -524,8 +524,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-034'(suite) -> [];
 'not-wf-sa-034'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/034.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/034.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -537,8 +537,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [43]
 'not-wf-sa-035'(suite) -> [];
 'not-wf-sa-035'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/035.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/035.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -550,8 +550,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [27]
 'not-wf-sa-036'(suite) -> [];
 'not-wf-sa-036'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/036.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/036.xml"]),
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
@@ -566,8 +566,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [27]
 'not-wf-sa-037'(suite) -> [];
 'not-wf-sa-037'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/037.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/037.xml"]),
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
@@ -582,8 +582,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'not-wf-sa-038'(suite) -> [];
 'not-wf-sa-038'(Config) -> 
-    ?line file:set_cwd(?config(data_dir,Config)),
-    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/038.xml"]),
+    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/038.xml"]),
     ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
     ?line check_result(R, "not-wf").
 
@@ -595,8 +595,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'not-wf-sa-039'(suite) -> [];
 'not-wf-sa-039'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/039.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/039.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -608,8 +608,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [27]
 'not-wf-sa-040'(suite) -> [];
 'not-wf-sa-040'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/040.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/040.xml"]),
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
@@ -624,8 +624,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [27]
 'not-wf-sa-041'(suite) -> [];
 'not-wf-sa-041'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/041.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/041.xml"]),
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
@@ -640,8 +640,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [42]
 'not-wf-sa-042'(suite) -> [];
 'not-wf-sa-042'(Config) ->  {skip, "Fix 1"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/042.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/042.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "not-wf").
 
@@ -653,8 +653,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [27]
 'not-wf-sa-043'(suite) -> [];
 'not-wf-sa-043'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/043.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/043.xml"]),
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
@@ -669,8 +669,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [27]
 'not-wf-sa-044'(suite) -> [];
 'not-wf-sa-044'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/044.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/044.xml"]),
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
@@ -685,8 +685,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'not-wf-sa-045'(suite) -> [];
 'not-wf-sa-045'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/045.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/045.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -698,8 +698,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40]
 'not-wf-sa-046'(suite) -> [];
 'not-wf-sa-046'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/046.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/046.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -711,8 +711,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'not-wf-sa-047'(suite) -> [];
 'not-wf-sa-047'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/047.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/047.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -724,8 +724,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [27]
 'not-wf-sa-048'(suite) -> [];
 'not-wf-sa-048'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/048.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/048.xml"]),
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
@@ -740,8 +740,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40]
 'not-wf-sa-049'(suite) -> [];
 'not-wf-sa-049'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/049.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/049.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -753,8 +753,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.1 [1]
 'not-wf-sa-050'(suite) -> [];
 'not-wf-sa-050'(Config) ->  {skip, "Fix 3"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/050.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/050.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "not-wf").
 
@@ -766,8 +766,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7 [18]
 'not-wf-sa-051'(suite) -> [];
 'not-wf-sa-051'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/051.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/051.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -779,8 +779,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'not-wf-sa-052'(suite) -> [];
 'not-wf-sa-052'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/052.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/052.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -792,8 +792,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [42]
 'not-wf-sa-053'(suite) -> [];
 'not-wf-sa-053'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/053.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/053.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -805,8 +805,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'not-wf-sa-054'(suite) -> [];
 'not-wf-sa-054'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/054.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/054.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -818,8 +818,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [28]
 'not-wf-sa-055'(suite) -> [];
 'not-wf-sa-055'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/055.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/055.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -831,8 +831,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [28]
 'not-wf-sa-056'(suite) -> [];
 'not-wf-sa-056'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/056.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/056.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -844,8 +844,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'not-wf-sa-057'(suite) -> [];
 'not-wf-sa-057'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/057.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/057.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -857,8 +857,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [54]
 'not-wf-sa-058'(suite) -> [];
 'not-wf-sa-058'(_Config) -> {skip, "Attlist Notation parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/058.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/058.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -870,8 +870,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [59]
 'not-wf-sa-059'(suite) -> [];
 'not-wf-sa-059'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/059.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/059.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -883,8 +883,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [56]
 'not-wf-sa-060'(suite) -> [];
 'not-wf-sa-060'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/060.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/060.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -896,8 +896,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'not-wf-sa-061'(suite) -> [];
 'not-wf-sa-061'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/061.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/061.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -909,8 +909,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [71]
 'not-wf-sa-062'(suite) -> [];
 'not-wf-sa-062'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/062.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/062.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -922,8 +922,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [29]
 'not-wf-sa-063'(suite) -> [];
 'not-wf-sa-063'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/063.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/063.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -935,8 +935,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [53]
 'not-wf-sa-064'(suite) -> [];
 'not-wf-sa-064'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/064.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/064.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -948,8 +948,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [53]
 'not-wf-sa-065'(suite) -> [];
 'not-wf-sa-065'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/065.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/065.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -961,8 +961,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [52]
 'not-wf-sa-066'(suite) -> [];
 'not-wf-sa-066'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/066.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/066.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -974,8 +974,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [53]
 'not-wf-sa-067'(suite) -> [];
 'not-wf-sa-067'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/067.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/067.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -987,8 +987,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [58]
 'not-wf-sa-068'(suite) -> [];
 'not-wf-sa-068'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/068.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/068.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1000,8 +1000,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [76]
 'not-wf-sa-069'(suite) -> [];
 'not-wf-sa-069'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/069.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/069.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1013,8 +1013,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5 [16]
 'not-wf-sa-070'(suite) -> [];
 'not-wf-sa-070'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/070.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/070.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1026,8 +1026,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'not-wf-sa-071'(suite) -> [];
 'not-wf-sa-071'(_Config) -> {skip, "No loop detection yet"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/071.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/071.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1039,8 +1039,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'not-wf-sa-072'(suite) -> [];
 'not-wf-sa-072'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/072.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/072.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1052,8 +1052,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'not-wf-sa-073'(suite) -> [];
 'not-wf-sa-073'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/073.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/073.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1065,8 +1065,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.2
 'not-wf-sa-074'(suite) -> [];
 'not-wf-sa-074'(_Config) -> {skip, "Entity not correct tag pair NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/074.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/074.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1078,8 +1078,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'not-wf-sa-075'(suite) -> [];
 'not-wf-sa-075'(_Config) ->  {skip, "No loop detection yet"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/075.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/075.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1091,8 +1091,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'not-wf-sa-076'(suite) -> [];
 'not-wf-sa-076'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/076.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/076.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1104,8 +1104,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 41. [68]
 'not-wf-sa-077'(suite) -> [];
 'not-wf-sa-077'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/077.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/077.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1117,8 +1117,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'not-wf-sa-078'(suite) -> [];
 'not-wf-sa-078'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/078.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/078.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1130,8 +1130,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'not-wf-sa-079'(suite) -> [];
 'not-wf-sa-079'(_Config) ->  {skip, "No loop detection yet"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/079.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/079.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1143,8 +1143,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'not-wf-sa-080'(suite) -> [];
 'not-wf-sa-080'(_Config) ->  {skip, "No loop detection yet"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/080.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/080.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1156,8 +1156,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'not-wf-sa-081'(suite) -> [];
 'not-wf-sa-081'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/081.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/081.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1169,8 +1169,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'not-wf-sa-082'(suite) -> [];
 'not-wf-sa-082'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/082.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/082.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1182,8 +1182,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [76]
 'not-wf-sa-083'(suite) -> [];
 'not-wf-sa-083'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/083.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/083.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1195,8 +1195,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1
 'not-wf-sa-084'(suite) -> [];
 'not-wf-sa-084'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/084.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/084.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1208,8 +1208,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [13]
 'not-wf-sa-085'(suite) -> [];
 'not-wf-sa-085'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/085.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/085.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1221,8 +1221,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [13]
 'not-wf-sa-086'(suite) -> [];
 'not-wf-sa-086'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/086.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/086.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1234,8 +1234,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [13]
 'not-wf-sa-087'(suite) -> [];
 'not-wf-sa-087'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/087.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/087.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1247,8 +1247,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [10]
 'not-wf-sa-088'(suite) -> [];
 'not-wf-sa-088'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/088.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/088.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1260,8 +1260,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [74]
 'not-wf-sa-089'(suite) -> [];
 'not-wf-sa-089'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/089.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/089.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1273,8 +1273,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [10]
 'not-wf-sa-090'(suite) -> [];
 'not-wf-sa-090'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/090.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/090.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1286,8 +1286,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [74]
 'not-wf-sa-091'(suite) -> [];
 'not-wf-sa-091'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/091.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/091.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1299,8 +1299,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.5
 'not-wf-sa-092'(suite) -> [];
 'not-wf-sa-092'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/092.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/092.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1312,8 +1312,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'not-wf-sa-093'(suite) -> [];
 'not-wf-sa-093'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/093.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/093.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1325,8 +1325,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [24]
 'not-wf-sa-094'(suite) -> [];
 'not-wf-sa-094'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/094.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/094.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1338,8 +1338,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [23]
 'not-wf-sa-095'(suite) -> [];
 'not-wf-sa-095'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/095.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/095.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1351,8 +1351,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9 [32]
 'not-wf-sa-096'(suite) -> [];
 'not-wf-sa-096'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/096.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/096.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1364,8 +1364,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [24]
 'not-wf-sa-097'(suite) -> [];
 'not-wf-sa-097'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/097.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/097.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1377,8 +1377,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [23]
 'not-wf-sa-098'(suite) -> [];
 'not-wf-sa-098'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/098.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/098.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1390,8 +1390,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [23]
 'not-wf-sa-099'(suite) -> [];
 'not-wf-sa-099'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/099.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/099.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1403,8 +1403,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9 [32]
 'not-wf-sa-100'(suite) -> [];
 'not-wf-sa-100'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/100.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/100.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1416,8 +1416,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [81]
 'not-wf-sa-101'(suite) -> [];
 'not-wf-sa-101'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/101.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/101.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1429,8 +1429,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [26]
 'not-wf-sa-102'(suite) -> [];
 'not-wf-sa-102'(Config) ->  {skip, "Fix 2"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/102.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/102.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "not-wf").
 
@@ -1442,8 +1442,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.2
 'not-wf-sa-103'(suite) -> [];
 'not-wf-sa-103'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/103.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/103.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1455,8 +1455,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.2
 'not-wf-sa-104'(suite) -> [];
 'not-wf-sa-104'(_Config) -> {skip, "Entity not correct tag pair NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/104.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/104.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1468,8 +1468,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7 
 'not-wf-sa-105'(suite) -> [];
 'not-wf-sa-105'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/105.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/105.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1481,8 +1481,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2
 'not-wf-sa-106'(suite) -> [];
 'not-wf-sa-106'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/106.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/106.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1494,8 +1494,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [28]
 'not-wf-sa-107'(suite) -> [];
 'not-wf-sa-107'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/107.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/107.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1507,8 +1507,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7 [19]
 'not-wf-sa-108'(suite) -> [];
 'not-wf-sa-108'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/108.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/108.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1520,8 +1520,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [70]
 'not-wf-sa-109'(suite) -> [];
 'not-wf-sa-109'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/109.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/109.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1533,8 +1533,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'not-wf-sa-110'(suite) -> [];
 'not-wf-sa-110'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/110.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/110.xml"]),
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
@@ -1549,8 +1549,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [43]
 'not-wf-sa-111'(suite) -> [];
 'not-wf-sa-111'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/111.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/111.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1562,8 +1562,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7 [19]
 'not-wf-sa-112'(suite) -> [];
 'not-wf-sa-112'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/112.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/112.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1575,8 +1575,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [9]
 'not-wf-sa-113'(suite) -> [];
 'not-wf-sa-113'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/113.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/113.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1588,8 +1588,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [9]
 'not-wf-sa-114'(suite) -> [];
 'not-wf-sa-114'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/114.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/114.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1601,8 +1601,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.5
 'not-wf-sa-115'(suite) -> [];
 'not-wf-sa-115'(_Config) -> {skip, "& expansion not correct"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/115.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/115.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1614,8 +1614,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.2
 'not-wf-sa-116'(suite) -> [];
 'not-wf-sa-116'(_Config) -> {skip, "& expansion not correct"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/116.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/116.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1627,8 +1627,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.2
 'not-wf-sa-117'(suite) -> [];
 'not-wf-sa-117'(_Config) -> {skip, "& expansion not correct"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/117.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/117.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1640,8 +1640,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'not-wf-sa-118'(suite) -> [];
 'not-wf-sa-118'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/118.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/118.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1653,8 +1653,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.2
 'not-wf-sa-119'(suite) -> [];
 'not-wf-sa-119'(_Config) -> {skip, "& expansion not correct"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/119.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/119.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1666,8 +1666,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.5
 'not-wf-sa-120'(suite) -> [];
 'not-wf-sa-120'(_Config) -> {skip, "& expansion not correct"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/120.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/120.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1679,8 +1679,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'not-wf-sa-121'(suite) -> [];
 'not-wf-sa-121'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/121.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/121.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1692,8 +1692,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [47]
 'not-wf-sa-122'(suite) -> [];
 'not-wf-sa-122'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/122.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/122.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1705,8 +1705,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [48]
 'not-wf-sa-123'(suite) -> [];
 'not-wf-sa-123'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/123.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/123.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1718,8 +1718,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'not-wf-sa-124'(suite) -> [];
 'not-wf-sa-124'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/124.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/124.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1731,8 +1731,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'not-wf-sa-125'(suite) -> [];
 'not-wf-sa-125'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/125.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/125.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1744,8 +1744,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'not-wf-sa-126'(suite) -> [];
 'not-wf-sa-126'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/126.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/126.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1757,8 +1757,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'not-wf-sa-127'(suite) -> [];
 'not-wf-sa-127'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/127.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/127.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1770,8 +1770,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7 [18]
 'not-wf-sa-128'(suite) -> [];
 'not-wf-sa-128'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/128.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/128.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1783,8 +1783,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'not-wf-sa-129'(suite) -> [];
 'not-wf-sa-129'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/129.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/129.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1796,8 +1796,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'not-wf-sa-130'(suite) -> [];
 'not-wf-sa-130'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/130.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/130.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1809,8 +1809,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'not-wf-sa-131'(suite) -> [];
 'not-wf-sa-131'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/131.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/131.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1822,8 +1822,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [50]
 'not-wf-sa-132'(suite) -> [];
 'not-wf-sa-132'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/132.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/132.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1835,8 +1835,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'not-wf-sa-133'(suite) -> [];
 'not-wf-sa-133'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/133.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/133.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1848,8 +1848,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'not-wf-sa-134'(suite) -> [];
 'not-wf-sa-134'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/134.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/134.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1861,8 +1861,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [47]
 'not-wf-sa-135'(suite) -> [];
 'not-wf-sa-135'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/135.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/135.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1874,8 +1874,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'not-wf-sa-136'(suite) -> [];
 'not-wf-sa-136'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/136.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/136.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1887,8 +1887,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'not-wf-sa-137'(suite) -> [];
 'not-wf-sa-137'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/137.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/137.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1900,8 +1900,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [48]
 'not-wf-sa-138'(suite) -> [];
 'not-wf-sa-138'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/138.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/138.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1913,8 +1913,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [46]
 'not-wf-sa-139'(suite) -> [];
 'not-wf-sa-139'(_Config) ->  {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/139.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/139.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -1926,8 +1926,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [4]
 'not-wf-sa-140'(suite) -> [];
 'not-wf-sa-140'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/140.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/140.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1939,8 +1939,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [5]
 'not-wf-sa-141'(suite) -> [];
 'not-wf-sa-141'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/141.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/141.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1952,8 +1952,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-142'(suite) -> [];
 'not-wf-sa-142'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/142.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/142.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1965,8 +1965,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-143'(suite) -> [];
 'not-wf-sa-143'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/143.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/143.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1978,8 +1978,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-144'(suite) -> [];
 'not-wf-sa-144'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/144.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/144.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -1991,8 +1991,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-145'(suite) -> [];
 'not-wf-sa-145'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/145.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/145.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2004,8 +2004,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-146'(suite) -> [];
 'not-wf-sa-146'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/146.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/146.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2017,8 +2017,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [22]
 'not-wf-sa-147'(suite) -> [];
 'not-wf-sa-147'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/147.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/147.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2030,8 +2030,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [22]
 'not-wf-sa-148'(suite) -> [];
 'not-wf-sa-148'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/148.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/148.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2043,8 +2043,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [28]
 'not-wf-sa-149'(suite) -> [];
 'not-wf-sa-149'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/149.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/149.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2056,8 +2056,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [43]
 'not-wf-sa-150'(suite) -> [];
 'not-wf-sa-150'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/150.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/150.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2069,8 +2069,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [27]
 'not-wf-sa-151'(suite) -> [];
 'not-wf-sa-151'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/151.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/151.xml"]),
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
@@ -2085,8 +2085,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [22]
 'not-wf-sa-152'(suite) -> [];
 'not-wf-sa-152'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/152.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/152.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2098,8 +2098,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.2
 'not-wf-sa-153'(suite) -> [];
 'not-wf-sa-153'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/153.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/153.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2111,8 +2111,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 2.6 [23, 17]
 'not-wf-sa-154'(suite) -> [];
 'not-wf-sa-154'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/154.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/154.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2124,8 +2124,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 2.6 [23, 17]
 'not-wf-sa-155'(suite) -> [];
 'not-wf-sa-155'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/155.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/155.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2137,8 +2137,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 2.6 [23, 17]
 'not-wf-sa-156'(suite) -> [];
 'not-wf-sa-156'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/156.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/156.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2150,8 +2150,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [17]
 'not-wf-sa-157'(suite) -> [];
 'not-wf-sa-157'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/157.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/157.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2163,8 +2163,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [52]
 'not-wf-sa-158'(suite) -> [];
 'not-wf-sa-158'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/158.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/158.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2176,8 +2176,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [9]
 'not-wf-sa-159'(suite) -> [];
 'not-wf-sa-159'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/159.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/159.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2189,8 +2189,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'not-wf-sa-160'(suite) -> [];
 'not-wf-sa-160'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/160.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/160.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2202,8 +2202,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'not-wf-sa-161'(suite) -> [];
 'not-wf-sa-161'(_Config) -> {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/161.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/161.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -2215,8 +2215,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'not-wf-sa-162'(suite) -> [];
 'not-wf-sa-162'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/162.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/162.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2228,8 +2228,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [69]
 'not-wf-sa-163'(suite) -> [];
 'not-wf-sa-163'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/163.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/163.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2241,8 +2241,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [69]
 'not-wf-sa-164'(suite) -> [];
 'not-wf-sa-164'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/164.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/164.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2254,8 +2254,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [72]
 'not-wf-sa-165'(suite) -> [];
 'not-wf-sa-165'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/165.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/165.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2267,8 +2267,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-166'(suite) -> [];
 'not-wf-sa-166'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/166.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/166.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2280,8 +2280,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-167'(suite) -> [];
 'not-wf-sa-167'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/167.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/167.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2293,8 +2293,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-168'(suite) -> [];
 'not-wf-sa-168'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/168.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/168.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2306,8 +2306,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-169'(suite) -> [];
 'not-wf-sa-169'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/169.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/169.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2319,8 +2319,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-170'(suite) -> [];
 'not-wf-sa-170'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/170.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/170.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2332,8 +2332,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-171'(suite) -> [];
 'not-wf-sa-171'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/171.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/171.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2345,8 +2345,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-172'(suite) -> [];
 'not-wf-sa-172'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/172.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/172.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2358,8 +2358,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-173'(suite) -> [];
 'not-wf-sa-173'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/173.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/173.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2371,8 +2371,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-174'(suite) -> [];
 'not-wf-sa-174'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/174.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/174.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2384,8 +2384,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-175'(suite) -> [];
 'not-wf-sa-175'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/175.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/175.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2397,8 +2397,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3 [39]
 'not-wf-sa-176'(suite) -> [];
 'not-wf-sa-176'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/176.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/176.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2410,8 +2410,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'not-wf-sa-177'(suite) -> [];
 'not-wf-sa-177'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/177.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/177.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2423,8 +2423,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [41]
 'not-wf-sa-178'(suite) -> [];
 'not-wf-sa-178'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/178.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/178.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2436,8 +2436,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'not-wf-sa-179'(suite) -> [];
 'not-wf-sa-179'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/179.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/179.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2449,8 +2449,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1
 'not-wf-sa-180'(suite) -> [];
 'not-wf-sa-180'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/180.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/180.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2462,8 +2462,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.2
 'not-wf-sa-181'(suite) -> [];
 'not-wf-sa-181'(_Config) -> {skip, "Entity not tag pair NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/181.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/181.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -2475,8 +2475,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.2
 'not-wf-sa-182'(suite) -> [];
 'not-wf-sa-182'(_Config) -> {skip, "Entity not tag pair NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/182.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/182.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -2488,8 +2488,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'not-wf-sa-183'(suite) -> [];
 'not-wf-sa-183'(_Config) -> {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/183.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/183.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -2501,8 +2501,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'not-wf-sa-184'(suite) -> [];
 'not-wf-sa-184'(_Config) -> {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/184.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/184.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -2514,8 +2514,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1
 'not-wf-sa-185'(suite) -> [];
 'not-wf-sa-185'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/185.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/185.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2527,8 +2527,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'not-wf-sa-186'(suite) -> [];
 'not-wf-sa-186'(Config) ->  {skip, "Fix 2"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/sa/186.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/186.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "not-wf").
 
@@ -2540,8 +2540,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [62]
 'not-wf-not-sa-001'(suite) -> [];
 'not-wf-not-sa-001'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/not-sa/001.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/001.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2553,8 +2553,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [17]
 'not-wf-not-sa-002'(suite) -> [];
 'not-wf-not-sa-002'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/not-sa/002.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/002.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2566,8 +2566,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [62]
 'not-wf-not-sa-003'(suite) -> [];
 'not-wf-not-sa-003'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/not-sa/003.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/003.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2579,8 +2579,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [62]
 'not-wf-not-sa-004'(suite) -> [];
 'not-wf-not-sa-004'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/not-sa/004.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/004.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2592,8 +2592,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1
 'not-wf-not-sa-005'(suite) -> [];
 'not-wf-not-sa-005'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/not-sa/005.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/005.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -2605,8 +2605,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [62]
 'not-wf-not-sa-006'(suite) -> [];
 'not-wf-not-sa-006'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/not-sa/006.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/006.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2618,8 +2618,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.2 [79]
 'not-wf-not-sa-007'(suite) -> [];
 'not-wf-not-sa-007'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/not-sa/007.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/007.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2631,8 +2631,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [69]
 'not-wf-not-sa-008'(suite) -> [];
 'not-wf-not-sa-008'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/not-sa/008.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/008.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -2644,8 +2644,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'not-wf-not-sa-009'(suite) -> [];
 'not-wf-not-sa-009'(_Config) -> {skip, "not a complete content in PE NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/not-sa/009.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/not-sa/009.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -2657,8 +2657,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1
 'not-wf-ext-sa-001'(suite) -> [];
 'not-wf-ext-sa-001'(Config) ->  {skip, "Fix 1"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/ext-sa/001.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/ext-sa/001.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "not-wf").
 
@@ -2670,8 +2670,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.1 4.3.2 [77, 78]
 'not-wf-ext-sa-002'(suite) -> [];
 'not-wf-ext-sa-002'(Config) -> {skip, "Fix 1"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/ext-sa/002.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/ext-sa/002.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "not-wf").
 
@@ -2683,8 +2683,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [17]
 'not-wf-ext-sa-003'(suite) -> [];
 'not-wf-ext-sa-003'(Config) -> {skip, "Fix 1"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"xmltest","not-wf/ext-sa/003.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/ext-sa/003.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "not-wf").
 
@@ -2696,8 +2696,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'invalid--002'(suite) -> [];
 'invalid--002'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","invalid/002.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","invalid/002.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -2709,8 +2709,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'invalid--005'(suite) -> [];
 'invalid--005'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","invalid/005.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","invalid/005.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -2722,8 +2722,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'invalid--006'(suite) -> [];
 'invalid--006'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","invalid/006.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","invalid/006.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -2735,8 +2735,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [62]
 'invalid-not-sa-022'(suite) -> [];
 'invalid-not-sa-022'(_Config) -> {skip, "DTD element content parsing NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","invalid/not-sa/022.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","invalid/not-sa/022.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "invalid").
 
@@ -2748,8 +2748,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'valid-sa-001'(suite) -> [];
 'valid-sa-001'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/001.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/001.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2761,8 +2761,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40]
 'valid-sa-002'(suite) -> [];
 'valid-sa-002'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/002.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/002.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2774,8 +2774,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [42]
 'valid-sa-003'(suite) -> [];
 'valid-sa-003'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/003.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/003.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2787,8 +2787,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [41]
 'valid-sa-004'(suite) -> [];
 'valid-sa-004'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/004.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/004.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2800,8 +2800,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40]
 'valid-sa-005'(suite) -> [];
 'valid-sa-005'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/005.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/005.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2813,8 +2813,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [41]
 'valid-sa-006'(suite) -> [];
 'valid-sa-006'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/006.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/006.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2826,8 +2826,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 4.6 [43]
 'valid-sa-007'(suite) -> [];
 'valid-sa-007'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/007.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/007.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2839,8 +2839,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.4 3.1 [43]
 'valid-sa-008'(suite) -> [];
 'valid-sa-008'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/008.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/008.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2852,8 +2852,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 3.1 [43]
 'valid-sa-009'(suite) -> [];
 'valid-sa-009'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/009.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/009.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2865,8 +2865,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40]
 'valid-sa-010'(suite) -> [];
 'valid-sa-010'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/010.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/010.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2878,8 +2878,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40]
 'valid-sa-011'(suite) -> [];
 'valid-sa-011'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/011.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/011.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2891,8 +2891,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [4]
 'valid-sa-012'(suite) -> [];
 'valid-sa-012'(Config) ->  {skip, "Fix 1"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/012.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/012.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "valid").
 
@@ -2904,8 +2904,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 3.1 [13] [40]
 'valid-sa-013'(suite) -> [];
 'valid-sa-013'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/013.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/013.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2917,8 +2917,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 3.1 [13] [40]
 'valid-sa-014'(suite) -> [];
 'valid-sa-014'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/014.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/014.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2930,8 +2930,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 3.1 [13] [40]
 'valid-sa-015'(suite) -> [];
 'valid-sa-015'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/015.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/015.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2943,8 +2943,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 3.1 [16] [43]
 'valid-sa-016'(suite) -> [];
 'valid-sa-016'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/016.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/016.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2956,8 +2956,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 3.1 [16] [43]
 'valid-sa-017'(suite) -> [];
 'valid-sa-017'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/017.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/017.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2969,8 +2969,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7 3.1 [18] [43]
 'valid-sa-018'(suite) -> [];
 'valid-sa-018'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/018.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/018.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2982,8 +2982,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7 3.1 [18] [43]
 'valid-sa-019'(suite) -> [];
 'valid-sa-019'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/019.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/019.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -2995,8 +2995,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7 3.1 [18] [43]
 'valid-sa-020'(suite) -> [];
 'valid-sa-020'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/020.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/020.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3008,8 +3008,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5 3.1 [15] [43]
 'valid-sa-021'(suite) -> [];
 'valid-sa-021'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/021.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/021.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3021,8 +3021,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5 3.1 [15] [43]
 'valid-sa-022'(suite) -> [];
 'valid-sa-022'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/022.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/022.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3034,8 +3034,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [43]
 'valid-sa-023'(suite) -> [];
 'valid-sa-023'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/023.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/023.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3047,8 +3047,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 4.1 [43] [66]
 'valid-sa-024'(suite) -> [];
 'valid-sa-024'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/024.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/024.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3060,8 +3060,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [46]
 'valid-sa-025'(suite) -> [];
 'valid-sa-025'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/025.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/025.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3073,8 +3073,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [46]
 'valid-sa-026'(suite) -> [];
 'valid-sa-026'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/026.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/026.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3086,8 +3086,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [46]
 'valid-sa-027'(suite) -> [];
 'valid-sa-027'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/027.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/027.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3099,8 +3099,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [24]
 'valid-sa-028'(suite) -> [];
 'valid-sa-028'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/028.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/028.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3112,8 +3112,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [24]
 'valid-sa-029'(suite) -> [];
 'valid-sa-029'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/029.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/029.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3125,8 +3125,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [25]
 'valid-sa-030'(suite) -> [];
 'valid-sa-030'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/030.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/030.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3138,8 +3138,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [80]
 'valid-sa-031'(suite) -> [];
 'valid-sa-031'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/031.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/031.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3151,8 +3151,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9 [32]
 'valid-sa-032'(suite) -> [];
 'valid-sa-032'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/032.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/032.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3164,8 +3164,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [23]
 'valid-sa-033'(suite) -> [];
 'valid-sa-033'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/033.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/033.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3177,8 +3177,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'valid-sa-034'(suite) -> [];
 'valid-sa-034'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/034.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/034.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3190,8 +3190,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'valid-sa-035'(suite) -> [];
 'valid-sa-035'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/035.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/035.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3203,8 +3203,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [16]
 'valid-sa-036'(suite) -> [];
 'valid-sa-036'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/036.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/036.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3216,8 +3216,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [15]
 'valid-sa-037'(suite) -> [];
 'valid-sa-037'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/037.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/037.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3229,8 +3229,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [15]
 'valid-sa-038'(suite) -> [];
 'valid-sa-038'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/038.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/038.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3242,8 +3242,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [16]
 'valid-sa-039'(suite) -> [];
 'valid-sa-039'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/039.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/039.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3255,8 +3255,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 3.3.1 [52] [54]
 'valid-sa-040'(suite) -> [];
 'valid-sa-040'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/040.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/040.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3268,8 +3268,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 4.1 [54] [66]
 'valid-sa-041'(suite) -> [];
 'valid-sa-041'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/041.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/041.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3281,8 +3281,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 4.1 [54] [66]
 'valid-sa-042'(suite) -> [];
 'valid-sa-042'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/042.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/042.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3294,8 +3294,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3
 'valid-sa-043'(suite) -> [];
 'valid-sa-043'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/043.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/043.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3307,8 +3307,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'valid-sa-044'(suite) -> [];
 'valid-sa-044'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/044.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/044.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3320,8 +3320,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [52]
 'valid-sa-045'(suite) -> [];
 'valid-sa-045'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/045.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/045.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3333,8 +3333,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [52]
 'valid-sa-046'(suite) -> [];
 'valid-sa-046'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/046.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/046.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3346,8 +3346,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [43]
 'valid-sa-047'(suite) -> [];
 'valid-sa-047'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/047.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/047.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3359,8 +3359,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.4 3.1 [14] [43]
 'valid-sa-048'(suite) -> [];
 'valid-sa-048'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/048.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/048.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3372,8 +3372,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'valid-sa-049'(suite) -> [];
 'valid-sa-049'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/049.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/049.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3385,8 +3385,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'valid-sa-050'(suite) -> [];
 'valid-sa-050'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/050.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/050.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3398,8 +3398,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'valid-sa-051'(suite) -> [];
 'valid-sa-051'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/051.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/051.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3411,8 +3411,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'valid-sa-052'(suite) -> [];
 'valid-sa-052'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/052.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/052.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3424,8 +3424,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.4.2
 'valid-sa-053'(suite) -> [];
 'valid-sa-053'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/053.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/053.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3437,8 +3437,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40] [42]
 'valid-sa-054'(suite) -> [];
 'valid-sa-054'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/054.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/054.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3450,8 +3450,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 2.10 [16]
 'valid-sa-055'(suite) -> [];
 'valid-sa-055'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/055.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/055.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3463,8 +3463,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 4.1 [54] [66]
 'valid-sa-056'(suite) -> [];
 'valid-sa-056'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/056.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/056.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3476,8 +3476,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [47]
 'valid-sa-057'(suite) -> [];
 'valid-sa-057'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/057.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/057.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3489,8 +3489,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.3
 'valid-sa-058'(suite) -> [];
 'valid-sa-058'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/058.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/058.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3502,8 +3502,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 3.3 [46] [53]
 'valid-sa-059'(suite) -> [];
 'valid-sa-059'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/059.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/059.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3515,8 +3515,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'valid-sa-060'(suite) -> [];
 'valid-sa-060'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/060.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/060.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3528,8 +3528,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'valid-sa-061'(suite) -> [];
 'valid-sa-061'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/061.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/061.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3541,8 +3541,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'valid-sa-062'(suite) -> [];
 'valid-sa-062'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/062.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/062.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3554,8 +3554,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [5]
 'valid-sa-063'(suite) -> [];
 'valid-sa-063'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/063.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/063.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3567,8 +3567,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'valid-sa-064'(suite) -> [];
 'valid-sa-064'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/064.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/064.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3580,8 +3580,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.5
 'valid-sa-065'(suite) -> [];
 'valid-sa-065'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/065.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/065.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3593,8 +3593,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'valid-sa-066'(suite) -> [];
 'valid-sa-066'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/066.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/066.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3606,8 +3606,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'valid-sa-067'(suite) -> [];
 'valid-sa-067'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/067.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/067.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3619,8 +3619,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.11, 4.5
 'valid-sa-068'(suite) -> [];
 'valid-sa-068'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/068.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/068.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3632,8 +3632,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.7
 'valid-sa-069'(suite) -> [];
 'valid-sa-069'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/069.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/069.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3645,8 +3645,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.4.8
 'valid-sa-070'(suite) -> [];
 'valid-sa-070'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/070.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/070.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3658,8 +3658,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 3.3.1 [52] [56]
 'valid-sa-071'(suite) -> [];
 'valid-sa-071'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/071.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/071.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3671,8 +3671,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 3.3.1 [52] [56]
 'valid-sa-072'(suite) -> [];
 'valid-sa-072'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/072.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/072.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3684,8 +3684,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 3.3.1 [52] [56]
 'valid-sa-073'(suite) -> [];
 'valid-sa-073'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/073.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/073.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3697,8 +3697,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 3.3.1 [52] [56]
 'valid-sa-074'(suite) -> [];
 'valid-sa-074'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/074.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/074.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3710,8 +3710,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 3.3.1 [52] [56]
 'valid-sa-075'(suite) -> [];
 'valid-sa-075'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/075.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/075.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3723,8 +3723,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'valid-sa-076'(suite) -> [];
 'valid-sa-076'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/076.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/076.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3736,8 +3736,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 3.3.1 [52] [54]
 'valid-sa-077'(suite) -> [];
 'valid-sa-077'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/077.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/077.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3749,8 +3749,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 3.3.1 [52] [54]
 'valid-sa-078'(suite) -> [];
 'valid-sa-078'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/078.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/078.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3762,8 +3762,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 3.3.2 [52] [60]
 'valid-sa-079'(suite) -> [];
 'valid-sa-079'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/079.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/079.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3775,8 +3775,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 3.3.2 [52] [60]
 'valid-sa-080'(suite) -> [];
 'valid-sa-080'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/080.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/080.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3788,8 +3788,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [50]
 'valid-sa-081'(suite) -> [];
 'valid-sa-081'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/081.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/081.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3801,8 +3801,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [72]
 'valid-sa-082'(suite) -> [];
 'valid-sa-082'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/082.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/082.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3814,8 +3814,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [72]
 'valid-sa-083'(suite) -> [];
 'valid-sa-083'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/083.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/083.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3827,8 +3827,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.10
 'valid-sa-084'(suite) -> [];
 'valid-sa-084'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/084.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/084.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3840,8 +3840,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4
 'valid-sa-085'(suite) -> [];
 'valid-sa-085'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/085.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/085.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3853,8 +3853,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2
 'valid-sa-086'(suite) -> [];
 'valid-sa-086'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/086.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/086.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3866,8 +3866,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.5
 'valid-sa-087'(suite) -> [];
 'valid-sa-087'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/087.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/087.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3879,8 +3879,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.5
 'valid-sa-088'(suite) -> [];
 'valid-sa-088'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/088.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/088.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3892,8 +3892,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'valid-sa-089'(suite) -> [];
 'valid-sa-089'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/089.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/089.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3905,8 +3905,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'valid-sa-090'(suite) -> [];
 'valid-sa-090'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/090.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/090.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3918,8 +3918,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'valid-sa-091'(suite) -> [];
 'valid-sa-091'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/091.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/091.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3931,8 +3931,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 2.10
 'valid-sa-092'(suite) -> [];
 'valid-sa-092'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/092.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/092.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3944,8 +3944,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.10
 'valid-sa-093'(suite) -> [];
 'valid-sa-093'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/093.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/093.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3957,8 +3957,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'valid-sa-094'(suite) -> [];
 'valid-sa-094'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/094.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/094.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3970,8 +3970,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.3
 'valid-sa-095'(suite) -> [];
 'valid-sa-095'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/095.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/095.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3983,8 +3983,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.3
 'valid-sa-096'(suite) -> [];
 'valid-sa-096'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/096.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/096.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -3996,8 +3996,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3
 'valid-sa-097'(suite) -> [];
 'valid-sa-097'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/097.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/097.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4009,8 +4009,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 2.10 [16]
 'valid-sa-098'(suite) -> [];
 'valid-sa-098'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/098.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/098.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4022,8 +4022,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [81]
 'valid-sa-099'(suite) -> [];
 'valid-sa-099'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/099.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/099.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4035,8 +4035,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [12]
 'valid-sa-100'(suite) -> [];
 'valid-sa-100'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/100.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/100.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4048,8 +4048,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.5
 'valid-sa-101'(suite) -> [];
 'valid-sa-101'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/101.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/101.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4061,8 +4061,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.3
 'valid-sa-102'(suite) -> [];
 'valid-sa-102'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/102.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/102.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4074,8 +4074,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.3
 'valid-sa-103'(suite) -> [];
 'valid-sa-103'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/103.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/103.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4087,8 +4087,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40]
 'valid-sa-104'(suite) -> [];
 'valid-sa-104'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/104.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/104.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4100,8 +4100,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.3
 'valid-sa-105'(suite) -> [];
 'valid-sa-105'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/105.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/105.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4113,8 +4113,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.3
 'valid-sa-106'(suite) -> [];
 'valid-sa-106'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/106.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/106.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4126,8 +4126,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.3
 'valid-sa-107'(suite) -> [];
 'valid-sa-107'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/107.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/107.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4139,8 +4139,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.11, 3.3.3
 'valid-sa-108'(suite) -> [];
 'valid-sa-108'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/108.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/108.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4152,8 +4152,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 3.1 [10][40][41]
 'valid-sa-109'(suite) -> [];
 'valid-sa-109'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/109.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/109.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4165,8 +4165,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.3
 'valid-sa-110'(suite) -> [];
 'valid-sa-110'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/110.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/110.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4178,8 +4178,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.3
 'valid-sa-111'(suite) -> [];
 'valid-sa-111'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/111.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/111.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4191,8 +4191,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [48][49]
 'valid-sa-112'(suite) -> [];
 'valid-sa-112'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/112.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/112.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4204,8 +4204,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [52][53]
 'valid-sa-113'(suite) -> [];
 'valid-sa-113'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/113.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/113.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4217,8 +4217,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7 [20]
 'valid-sa-114'(suite) -> [];
 'valid-sa-114'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/114.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/114.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4230,8 +4230,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.3
 'valid-sa-115'(suite) -> [];
 'valid-sa-115'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/115.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/115.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4243,8 +4243,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.11
 'valid-sa-116'(suite) -> [];
 'valid-sa-116'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/116.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/116.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4256,8 +4256,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.5
 'valid-sa-117'(suite) -> [];
 'valid-sa-117'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/117.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/117.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4269,8 +4269,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.5
 'valid-sa-118'(suite) -> [];
 'valid-sa-118'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/118.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/118.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4282,8 +4282,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5
 'valid-sa-119'(suite) -> [];
 'valid-sa-119'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/sa/119.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/sa/119.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4295,8 +4295,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'valid-not-sa-001'(suite) -> [];
 'valid-not-sa-001'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/001.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/001.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4308,8 +4308,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'valid-not-sa-002'(suite) -> [];
 'valid-not-sa-002'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/002.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/002.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4321,8 +4321,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [69]
 'valid-not-sa-003'(suite) -> [];
 'valid-not-sa-003'(_Config) -> {skip, "external entity NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/003.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/003.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4334,8 +4334,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [69]
 'valid-not-sa-004'(suite) -> [];
 'valid-not-sa-004'(_Config) -> {skip, "external entity NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/004.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/004.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4347,8 +4347,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [69]
 'valid-not-sa-005'(suite) -> [];
 'valid-not-sa-005'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/005.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/005.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4360,8 +4360,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [52]
 'valid-not-sa-006'(suite) -> [];
 'valid-not-sa-006'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/006.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/006.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4373,8 +4373,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [52]
 'valid-not-sa-007'(suite) -> [];
 'valid-not-sa-007'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/007.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/007.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4386,8 +4386,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'valid-not-sa-008'(suite) -> [];
 'valid-not-sa-008'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/008.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/008.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4399,8 +4399,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'valid-not-sa-009'(suite) -> [];
 'valid-not-sa-009'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/009.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/009.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4412,8 +4412,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [52]
 'valid-not-sa-010'(suite) -> [];
 'valid-not-sa-010'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/010.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/010.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4425,8 +4425,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 4.2.1 [72] [75]
 'valid-not-sa-011'(suite) -> [];
 'valid-not-sa-011'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/011.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/011.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4438,8 +4438,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.1 [77]
 'valid-not-sa-012'(suite) -> [];
 'valid-not-sa-012'(Config) -> {skip, "Fix 3"}.
-  %%  ?line file:set_cwd(?config(data_dir,Config)),
-   %% ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/012.xml"]),
+  %%  ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %% ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/012.xml"]),
    %% ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %% ?line check_result(R, "valid").
 
@@ -4451,8 +4451,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [62]
 'valid-not-sa-013'(suite) -> [];
 'valid-not-sa-013'(_Config) ->  {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/013.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/013.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4464,8 +4464,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [62]
 'valid-not-sa-014'(suite) -> [];
 'valid-not-sa-014'(_Config) ->  {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/014.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/014.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4477,8 +4477,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [63]
 'valid-not-sa-015'(suite) -> [];
 'valid-not-sa-015'(_Config) ->  {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/015.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/015.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4490,8 +4490,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [62]
 'valid-not-sa-016'(suite) -> [];
 'valid-not-sa-016'(_Config) ->  {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/016.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/016.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4503,8 +4503,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [72]
 'valid-not-sa-017'(suite) -> [];
 'valid-not-sa-017'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/017.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/017.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4516,8 +4516,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'valid-not-sa-018'(suite) -> [];
 'valid-not-sa-018'(_Config) ->  {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/018.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/018.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4529,8 +4529,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.4.8
 'valid-not-sa-019'(suite) -> [];
 'valid-not-sa-019'(_Config) -> {skip, "partly replacement of markupdecls"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/019.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/019.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4542,8 +4542,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.4.8
 'valid-not-sa-020'(suite) -> [];
 'valid-not-sa-020'(_Config) -> {skip, "partly replacement of markupdecls"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/020.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/020.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4555,8 +4555,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [72]
 'valid-not-sa-021'(suite) -> [];
 'valid-not-sa-021'(_Config) -> {skip, "partly replacement of markupdecls"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/021.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/021.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4568,8 +4568,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 4.1 [10] [69]
 'valid-not-sa-023'(suite) -> [];
 'valid-not-sa-023'(_Config) -> {skip, "partly replacement of markupdecls"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/023.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/023.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4581,8 +4581,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8, 4.1 [69]
 'valid-not-sa-024'(suite) -> [];
 'valid-not-sa-024'(_Config) -> {skip, "partly replacement of markupdecls"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/024.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/024.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4594,8 +4594,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2
 'valid-not-sa-025'(suite) -> [];
 'valid-not-sa-025'(_Config) -> {skip, "partly replacement of markupdecls"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/025.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/025.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4607,8 +4607,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [52]
 'valid-not-sa-026'(suite) -> [];
 'valid-not-sa-026'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/026.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/026.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4620,8 +4620,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [69]
 'valid-not-sa-027'(suite) -> [];
 'valid-not-sa-027'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/027.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/027.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -4633,8 +4633,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [62]
 'valid-not-sa-028'(suite) -> [];
 'valid-not-sa-028'(_Config) ->  {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/028.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/028.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4646,8 +4646,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [62]
 'valid-not-sa-029'(suite) -> [];
 'valid-not-sa-029'(_Config) ->  {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/029.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/029.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4659,8 +4659,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [62]
 'valid-not-sa-030'(suite) -> [];
 'valid-not-sa-030'(_Config) ->  {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/030.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/030.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4672,8 +4672,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7
 'valid-not-sa-031'(suite) -> [];
 'valid-not-sa-031'(_Config) ->  {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/not-sa/031.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/not-sa/031.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4685,8 +4685,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.11
 'valid-ext-sa-001'(suite) -> [];
 'valid-ext-sa-001'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/ext-sa/001.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/001.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4698,8 +4698,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.11
 'valid-ext-sa-002'(suite) -> [];
 'valid-ext-sa-002'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/ext-sa/002.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/002.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4711,8 +4711,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 4.1 [43] [68]
 'valid-ext-sa-003'(suite) -> [];
 'valid-ext-sa-003'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/ext-sa/003.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/003.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4724,8 +4724,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.11
 'valid-ext-sa-004'(suite) -> [];
 'valid-ext-sa-004'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/ext-sa/004.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/004.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4737,8 +4737,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 4.2.2 [48] [75]
 'valid-ext-sa-005'(suite) -> [];
 'valid-ext-sa-005'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/ext-sa/005.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/005.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4750,8 +4750,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.11 3.2.1 3.2.2 4.2.2 [48] [51] [75]
 'valid-ext-sa-006'(suite) -> [];
 'valid-ext-sa-006'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/ext-sa/006.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/006.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4763,8 +4763,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 4.4.3 [75]
 'valid-ext-sa-007'(suite) -> [];
 'valid-ext-sa-007'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/ext-sa/007.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/007.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4776,8 +4776,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 4.3.3. 4.4.3 [75] [80]
 'valid-ext-sa-008'(suite) -> [];
 'valid-ext-sa-008'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/ext-sa/008.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/008.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4789,8 +4789,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.11
 'valid-ext-sa-009'(suite) -> [];
 'valid-ext-sa-009'(_Config) ->  {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/ext-sa/009.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/009.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4802,8 +4802,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.11 4.2.2 [75]
 'valid-ext-sa-011'(suite) -> [];
 'valid-ext-sa-011'(_Config) ->  {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/ext-sa/011.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/011.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4815,8 +4815,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.1 4.2.2
 'valid-ext-sa-012'(suite) -> [];
 'valid-ext-sa-012'(_Config) ->  {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/ext-sa/012.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/012.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4828,8 +4828,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.3
 'valid-ext-sa-013'(suite) -> [];
 'valid-ext-sa-013'(_Config) ->  {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/ext-sa/013.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/013.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4841,8 +4841,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 4.4.3 [68]
 'valid-ext-sa-014'(suite) -> [];
 'valid-ext-sa-014'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"xmltest","valid/ext-sa/014.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","valid/ext-sa/014.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -4864,8 +4864,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [4,84]
 'pr-xml-euc-jp'(suite) -> [];
 'pr-xml-euc-jp'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"japanese","pr-xml-euc-jp.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","pr-xml-euc-jp.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -4877,8 +4877,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [4,84]
 'pr-xml-iso-2022-jp'(suite) -> [];
 'pr-xml-iso-2022-jp'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"japanese","pr-xml-iso-2022-jp.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","pr-xml-iso-2022-jp.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -4890,8 +4890,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [4,84]
 'pr-xml-little'(suite) -> [];
 'pr-xml-little'(Config) ->  {skip, "Fix 3"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"japanese","pr-xml-little-endian.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","pr-xml-little-endian.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "valid").
 
@@ -4903,8 +4903,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [4,84]
 'pr-xml-shift_jis'(suite) -> [];
 'pr-xml-shift_jis'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"japanese","pr-xml-shift_jis.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","pr-xml-shift_jis.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -4916,8 +4916,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [4,84]
 'pr-xml-utf-16'(suite) -> [];
 'pr-xml-utf-16'(Config) ->  {skip, "Fix 3"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"japanese","pr-xml-utf-16.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","pr-xml-utf-16.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "valid").
 
@@ -4929,8 +4929,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [4,84]
 'pr-xml-utf-8'(suite) -> [];
 'pr-xml-utf-8'(Config) ->  {skip, "Fix 3"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"japanese","pr-xml-utf-8.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","pr-xml-utf-8.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "valid").
 
@@ -4942,8 +4942,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [4,84]
 'weekly-euc-jp'(suite) -> [];
 'weekly-euc-jp'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"japanese","weekly-euc-jp.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","weekly-euc-jp.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -4955,8 +4955,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [4,84]
 'weekly-iso-2022-jp'(suite) -> [];
 'weekly-iso-2022-jp'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"japanese","weekly-iso-2022-jp.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","weekly-iso-2022-jp.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -4968,8 +4968,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [4,84]
 'weekly-little'(suite) -> [];
 'weekly-little'(Config) ->  {skip, "Fix 3"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"japanese","weekly-little-endian.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","weekly-little-endian.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "valid").
 
@@ -4981,8 +4981,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [4,84]
 'weekly-shift_jis'(suite) -> [];
 'weekly-shift_jis'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"japanese","weekly-shift_jis.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","weekly-shift_jis.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -4994,8 +4994,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [4,84]
 'weekly-utf-16'(suite) -> [];
 'weekly-utf-16'(Config) -> {skip, "Fix 3"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"japanese","weekly-utf-16.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","weekly-utf-16.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "valid").
 
@@ -5007,8 +5007,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [4,84]
 'weekly-utf-8'(suite) -> [];
 'weekly-utf-8'(Config) -> {skip, "Fix 3"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"japanese","weekly-utf-8.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"japanese","weekly-utf-8.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "valid").
 
@@ -5030,8 +5030,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'pe01'(suite) -> [];
 'pe01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/pe01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/pe01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5043,8 +5043,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'dtd00'(suite) -> [];
 'dtd00'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/dtd00.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/dtd00.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5056,8 +5056,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5 [15]
 'dtd01'(suite) -> [];
 'dtd01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/dtd01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/dtd01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5069,8 +5069,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'element'(suite) -> [];
 'element'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/element.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/element.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5082,8 +5082,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.1 4.3.2 [77] [78]
 'ext01'(suite) -> [];
 'ext01'(Config) ->  {skip, "Fix 3"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"sun","valid/ext01.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/ext01.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "valid").
 
@@ -5095,8 +5095,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.2 [78]
 'ext02'(suite) -> [];
 'ext02'(Config) ->  {skip, "Fix 3"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"sun","valid/ext02.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/ext02.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "valid").
 
@@ -5108,8 +5108,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'not-sa01'(suite) -> [];
 'not-sa01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/not-sa01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/not-sa01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5121,8 +5121,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'not-sa02'(suite) -> [];
 'not-sa02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/not-sa02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/not-sa02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5134,8 +5134,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'not-sa03'(suite) -> [];
 'not-sa03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/not-sa03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/not-sa03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5147,8 +5147,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'not-sa04'(suite) -> [];
 'not-sa04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/not-sa04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/not-sa04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5160,8 +5160,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.7 [82]
 'notation01'(suite) -> [];
 'notation01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/notation01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/notation01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5173,8 +5173,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3 3.2.1 [47]
 'optional'(suite) -> [];
 'optional'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/optional.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/optional.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5186,8 +5186,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2 [60]
 'required00'(suite) -> [];
 'required00'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/required00.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/required00.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5199,8 +5199,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9 [32]
 'sa01'(suite) -> [];
 'sa01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/sa01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/sa01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5212,8 +5212,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9 [32]
 'sa02'(suite) -> [];
 'sa02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/sa02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/sa02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5225,8 +5225,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9 [32]
 'sa03'(suite) -> [];
 'sa03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/sa03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/sa03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5238,8 +5238,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9 [32]
 'sa04'(suite) -> [];
 'sa04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/sa04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/sa04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5251,8 +5251,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9 [32]
 'sa05'(suite) -> [];
 'sa05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/sa05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/sa05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5264,8 +5264,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [59]
 'v-sgml01'(suite) -> [];
 'v-sgml01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/sgml01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/sgml01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5277,8 +5277,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.12 [35]
 'v-lang01'(suite) -> [];
 'v-lang01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/v-lang01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/v-lang01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5290,8 +5290,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.12 [35]
 'v-lang02'(suite) -> [];
 'v-lang02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/v-lang02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/v-lang02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5303,8 +5303,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.12 [36]
 'v-lang03'(suite) -> [];
 'v-lang03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/v-lang03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/v-lang03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5316,8 +5316,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.12 [37]
 'v-lang04'(suite) -> [];
 'v-lang04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/v-lang04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/v-lang04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5329,8 +5329,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.12 [35]
 'v-lang05'(suite) -> [];
 'v-lang05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/v-lang05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/v-lang05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5342,8 +5342,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.12 [37]
 'v-lang06'(suite) -> [];
 'v-lang06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/v-lang06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/v-lang06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5355,8 +5355,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.5
 'v-pe00'(suite) -> [];
 'v-pe00'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/pe00.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/pe00.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5368,8 +5368,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.5
 'v-pe03'(suite) -> [];
 'v-pe03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/pe03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/pe03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5381,8 +5381,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.5
 'v-pe02'(suite) -> [];
 'v-pe02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","valid/pe02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","valid/pe02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -5394,8 +5394,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2
 'inv-dtd01'(suite) -> [];
 'inv-dtd01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/dtd01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/dtd01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5407,8 +5407,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2
 'inv-dtd02'(suite) -> [];
 'inv-dtd02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/dtd02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/dtd02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5420,8 +5420,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'inv-dtd03'(suite) -> [];
 'inv-dtd03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/dtd03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/dtd03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5433,8 +5433,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'el01'(suite) -> [];
 'el01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/el01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/el01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5446,8 +5446,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'el02'(suite) -> [];
 'el02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/el02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/el02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5459,8 +5459,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'el03'(suite) -> [];
 'el03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/el03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/el03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5472,8 +5472,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'el04'(suite) -> [];
 'el04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/el04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/el04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5485,8 +5485,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2
 'el05'(suite) -> [];
 'el05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/el05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/el05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5498,8 +5498,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'el06'(suite) -> [];
 'el06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/el06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/el06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5511,8 +5511,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'id01'(suite) -> [];
 'id01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/id01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5524,8 +5524,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'id02'(suite) -> [];
 'id02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/id02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5537,8 +5537,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'id03'(suite) -> [];
 'id03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/id03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5550,8 +5550,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'id04'(suite) -> [];
 'id04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/id04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5563,8 +5563,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'id05'(suite) -> [];
 'id05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/id05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5576,8 +5576,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'id06'(suite) -> [];
 'id06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/id06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5589,8 +5589,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'id07'(suite) -> [];
 'id07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/id07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5602,8 +5602,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'id08'(suite) -> [];
 'id08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/id08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5615,8 +5615,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'id09'(suite) -> [];
 'id09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/id09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/id09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5628,8 +5628,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'inv-not-sa01'(suite) -> [];
 'inv-not-sa01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/not-sa01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5641,8 +5641,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'inv-not-sa02'(suite) -> [];
 'inv-not-sa02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/not-sa02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5654,8 +5654,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'inv-not-sa04'(suite) -> [];
 'inv-not-sa04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/not-sa04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5667,8 +5667,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'inv-not-sa05'(suite) -> [];
 'inv-not-sa05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/not-sa05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5680,8 +5680,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'inv-not-sa06'(suite) -> [];
 'inv-not-sa06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/not-sa06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5693,8 +5693,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'inv-not-sa07'(suite) -> [];
 'inv-not-sa07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/not-sa07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5706,8 +5706,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'inv-not-sa08'(suite) -> [];
 'inv-not-sa08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/not-sa08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5719,8 +5719,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'inv-not-sa09'(suite) -> [];
 'inv-not-sa09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/not-sa09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5732,8 +5732,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'inv-not-sa10'(suite) -> [];
 'inv-not-sa10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/not-sa10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5745,8 +5745,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'inv-not-sa11'(suite) -> [];
 'inv-not-sa11'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/not-sa11.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa11.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5758,8 +5758,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'inv-not-sa12'(suite) -> [];
 'inv-not-sa12'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/not-sa12.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa12.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5771,8 +5771,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'inv-not-sa13'(suite) -> [];
 'inv-not-sa13'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/not-sa13.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa13.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5784,8 +5784,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'inv-not-sa14'(suite) -> [];
 'inv-not-sa14'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/not-sa14.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/not-sa14.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5797,8 +5797,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional01'(suite) -> [];
 'optional01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5810,8 +5810,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional02'(suite) -> [];
 'optional02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5823,8 +5823,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional03'(suite) -> [];
 'optional03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5836,8 +5836,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional04'(suite) -> [];
 'optional04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5849,8 +5849,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional05'(suite) -> [];
 'optional05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5862,8 +5862,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional06'(suite) -> [];
 'optional06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5875,8 +5875,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional07'(suite) -> [];
 'optional07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5888,8 +5888,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional08'(suite) -> [];
 'optional08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5901,8 +5901,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional09'(suite) -> [];
 'optional09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5914,8 +5914,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional10'(suite) -> [];
 'optional10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5927,8 +5927,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional11'(suite) -> [];
 'optional11'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional11.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional11.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5940,8 +5940,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional12'(suite) -> [];
 'optional12'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional12.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional12.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5953,8 +5953,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional13'(suite) -> [];
 'optional13'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional13.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional13.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5966,8 +5966,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional14'(suite) -> [];
 'optional14'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional14.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional14.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5979,8 +5979,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional20'(suite) -> [];
 'optional20'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional20.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional20.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -5992,8 +5992,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional21'(suite) -> [];
 'optional21'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional21.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional21.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6005,8 +6005,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional22'(suite) -> [];
 'optional22'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional22.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional22.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6018,8 +6018,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional23'(suite) -> [];
 'optional23'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional23.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional23.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6031,8 +6031,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional24'(suite) -> [];
 'optional24'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional24.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional24.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6044,8 +6044,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'optional25'(suite) -> [];
 'optional25'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/optional25.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/optional25.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6057,8 +6057,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2
 'inv-required00'(suite) -> [];
 'inv-required00'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/required00.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/required00.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6070,8 +6070,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 2.10
 'inv-required01'(suite) -> [];
 'inv-required01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/required01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/required01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6083,8 +6083,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 2.12
 'inv-required02'(suite) -> [];
 'inv-required02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/required02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/required02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6096,8 +6096,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'root'(suite) -> [];
 'root'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/root.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/root.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6109,8 +6109,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'attr01'(suite) -> [];
 'attr01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6122,8 +6122,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'attr02'(suite) -> [];
 'attr02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6135,8 +6135,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'attr03'(suite) -> [];
 'attr03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6148,8 +6148,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'attr04'(suite) -> [];
 'attr04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6161,8 +6161,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'attr05'(suite) -> [];
 'attr05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6174,8 +6174,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'attr06'(suite) -> [];
 'attr06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6187,8 +6187,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'attr07'(suite) -> [];
 'attr07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6200,8 +6200,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2
 'attr08'(suite) -> [];
 'attr08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6213,8 +6213,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2
 'attr09'(suite) -> [];
 'attr09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6226,8 +6226,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2
 'attr10'(suite) -> [];
 'attr10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6239,8 +6239,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2
 'attr11'(suite) -> [];
 'attr11'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr11.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr11.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6252,8 +6252,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2
 'attr12'(suite) -> [];
 'attr12'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr12.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr12.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6265,8 +6265,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2
 'attr13'(suite) -> [];
 'attr13'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr13.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr13.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6278,8 +6278,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2
 'attr14'(suite) -> [];
 'attr14'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr14.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr14.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6291,8 +6291,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2
 'attr15'(suite) -> [];
 'attr15'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr15.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr15.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6304,8 +6304,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2
 'attr16'(suite) -> [];
 'attr16'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/attr16.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/attr16.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6317,8 +6317,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 2.8
 'utf16b'(suite) -> [];
 'utf16b'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/utf16b.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/utf16b.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6330,8 +6330,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 2.8
 'utf16l'(suite) -> [];
 'utf16l'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/utf16l.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/utf16l.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6343,8 +6343,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.4 2.7 [18] 3
 'empty'(suite) -> [];
 'empty'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","invalid/empty.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","invalid/empty.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -6356,8 +6356,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'not-wf-sa03'(suite) -> [];
 'not-wf-sa03'(Config) -> {skip, "Fix 3"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/not-sa03.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/not-sa03.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "not-wf").
 
@@ -6369,8 +6369,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [56]
 'attlist01'(suite) -> [];
 'attlist01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/attlist01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6382,8 +6382,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [56]
 'attlist02'(suite) -> [];
 'attlist02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/attlist02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6395,8 +6395,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [59]
 'attlist03'(suite) -> [];
 'attlist03'(_Config) ->  {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/attlist03.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist03.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -6408,8 +6408,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [56]
 'attlist04'(suite) -> [];
 'attlist04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/attlist04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6421,8 +6421,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [56]
 'attlist05'(suite) -> [];
 'attlist05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/attlist05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6434,8 +6434,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [56]
 'attlist06'(suite) -> [];
 'attlist06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/attlist06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6447,8 +6447,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [56]
 'attlist07'(suite) -> [];
 'attlist07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/attlist07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6460,8 +6460,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [56]
 'attlist08'(suite) -> [];
 'attlist08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/attlist08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6473,8 +6473,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [56]
 'attlist09'(suite) -> [];
 'attlist09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/attlist09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6486,8 +6486,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40]
 'attlist10'(suite) -> [];
 'attlist10'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/attlist10.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist10.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -6499,8 +6499,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'attlist11'(suite) -> [];
 'attlist11'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/attlist11.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/attlist11.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -6512,8 +6512,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [61]
 'cond01'(suite) -> [];
 'cond01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/cond01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/cond01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6525,8 +6525,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [61]
 'cond02'(suite) -> [];
 'cond02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/cond02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/cond02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6538,8 +6538,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [48]
 'content01'(suite) -> [];
 'content01'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/content01.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/content01.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -6551,8 +6551,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [48]
 'content02'(suite) -> [];
 'content02'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/content02.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/content02.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -6564,8 +6564,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [48]
 'content03'(suite) -> [];
 'content03'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/content03.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/content03.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -6577,8 +6577,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.1 [77]
 'decl01'(suite) -> [];
 'decl01'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/decl01.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/decl01.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -6590,8 +6590,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [55]
 'nwf-dtd00'(suite) -> [];
 'nwf-dtd00'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/dtd00.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/dtd00.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -6603,8 +6603,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [55]
 'nwf-dtd01'(suite) -> [];
 'nwf-dtd01'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/dtd01.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/dtd01.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -6616,8 +6616,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [69]
 'dtd02'(suite) -> [];
 'dtd02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/dtd02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/dtd02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6629,8 +6629,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [69]
 'dtd03'(suite) -> [];
 'dtd03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/dtd03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/dtd03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6642,8 +6642,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'dtd04'(suite) -> [];
 'dtd04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/dtd04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/dtd04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6655,8 +6655,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'dtd05'(suite) -> [];
 'dtd05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/dtd05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/dtd05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6668,8 +6668,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.1 [77]
 'dtd07'(suite) -> [];
 'dtd07'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/dtd07.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/dtd07.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -6681,8 +6681,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [42]
 'element00'(suite) -> [];
 'element00'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/element00.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/element00.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6694,8 +6694,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [42]
 'element01'(suite) -> [];
 'element01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/element01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/element01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6707,8 +6707,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [43]
 'element02'(suite) -> [];
 'element02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/element02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/element02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6720,8 +6720,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [43]
 'element03'(suite) -> [];
 'element03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/element03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/element03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6733,8 +6733,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [43]
 'element04'(suite) -> [];
 'element04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/element04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/element04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6746,8 +6746,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [81]
 'encoding01'(suite) -> [];
 'encoding01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/encoding01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/encoding01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6759,8 +6759,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [81]
 'encoding02'(suite) -> [];
 'encoding02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/encoding02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/encoding02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6772,8 +6772,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [81]
 'encoding03'(suite) -> [];
 'encoding03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/encoding03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/encoding03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6785,8 +6785,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [81]
 'encoding04'(suite) -> [];
 'encoding04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/encoding04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/encoding04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6798,8 +6798,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [81]
 'encoding05'(suite) -> [];
 'encoding05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/encoding05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/encoding05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6811,8 +6811,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.3 [81]
 'encoding06'(suite) -> [];
 'encoding06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/encoding06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/encoding06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6824,8 +6824,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.3.1 [77]
 'encoding07'(suite) -> [];
 'encoding07'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/encoding07.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/encoding07.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -6837,8 +6837,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [16]
 'pi'(suite) -> [];
 'pi'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/pi.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/pi.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6850,8 +6850,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [12]
 'pubid01'(suite) -> [];
 'pubid01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/pubid01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/pubid01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6863,8 +6863,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [12]
 'pubid02'(suite) -> [];
 'pubid02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/pubid02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/pubid02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6876,8 +6876,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [12]
 'pubid03'(suite) -> [];
 'pubid03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/pubid03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/pubid03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6889,8 +6889,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [12]
 'pubid04'(suite) -> [];
 'pubid04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/pubid04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/pubid04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6902,8 +6902,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [12]
 'pubid05'(suite) -> [];
 'pubid05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/pubid05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/pubid05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6915,8 +6915,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3 [39]
 'sgml01'(suite) -> [];
 'sgml01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/sgml01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6928,8 +6928,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 
 'sgml02'(suite) -> [];
 'sgml02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/sgml02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6941,8 +6941,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5 [15]
 'sgml03'(suite) -> [];
 'sgml03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/sgml03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6954,8 +6954,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [52]
 'sgml04'(suite) -> [];
 'sgml04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/sgml04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6967,8 +6967,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'sgml05'(suite) -> [];
 'sgml05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/sgml05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6980,8 +6980,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [52]
 'sgml06'(suite) -> [];
 'sgml06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/sgml06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -6993,8 +6993,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'sgml07'(suite) -> [];
 'sgml07'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/sgml07.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml07.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -7006,8 +7006,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'sgml08'(suite) -> [];
 'sgml08'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/sgml08.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml08.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -7019,8 +7019,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'sgml09'(suite) -> [];
 'sgml09'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/sgml09.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml09.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -7032,8 +7032,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'sgml10'(suite) -> [];
 'sgml10'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/sgml10.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml10.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -7045,8 +7045,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [46]
 'sgml11'(suite) -> [];
 'sgml11'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/sgml11.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml11.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -7058,8 +7058,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [46]
 'sgml12'(suite) -> [];
 'sgml12'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/sgml12.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml12.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -7071,8 +7071,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [47]
 'sgml13'(suite) -> [];
 'sgml13'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/sgml13.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/sgml13.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -7084,8 +7084,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'uri01'(suite) -> [];
 'uri01'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"sun","not-wf/uri01.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"sun","not-wf/uri01.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "error").
 
@@ -7102,8 +7102,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [1]
 'o-p01pass2'(suite) -> [];
 'o-p01pass2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p01pass2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p01pass2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7115,8 +7115,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [6]
 'o-p06pass1'(suite) -> [];
 'o-p06pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p06pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p06pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7128,8 +7128,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [7]
 'o-p07pass1'(suite) -> [];
 'o-p07pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p07pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p07pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7141,8 +7141,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [8]
 'o-p08pass1'(suite) -> [];
 'o-p08pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p08pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p08pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7154,8 +7154,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [9]
 'o-p09pass1'(suite) -> [];
 'o-p09pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p09pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p09pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7167,8 +7167,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [12]
 'o-p12pass1'(suite) -> [];
 'o-p12pass1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p12pass1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12pass1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -7180,8 +7180,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [22]
 'o-p22pass4'(suite) -> [];
 'o-p22pass4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p22pass4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22pass4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7193,8 +7193,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [22]
 'o-p22pass5'(suite) -> [];
 'o-p22pass5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p22pass5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22pass5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7206,8 +7206,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [22]
 'o-p22pass6'(suite) -> [];
 'o-p22pass6'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p22pass6.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22pass6.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7219,8 +7219,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [43] [44]
 'o-p28pass1'(suite) -> [];
 'o-p28pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p28pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p28pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7232,8 +7232,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 4.1 [28] [69]
 'o-p28pass3'(suite) -> [];
 'o-p28pass3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p28pass3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p28pass3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7245,8 +7245,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 4.2.2 [28] [75]
 'o-p28pass4'(suite) -> [];
 'o-p28pass4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p28pass4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p28pass4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7258,8 +7258,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 4.1 [28] [69]
 'o-p28pass5'(suite) -> [];
 'o-p28pass5'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p28pass5.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p28pass5.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -7271,8 +7271,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [29]
 'o-p29pass1'(suite) -> [];
 'o-p29pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p29pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p29pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7284,8 +7284,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 4.2.2 [30] [75]
 'o-p30pass1'(suite) -> [];
 'o-p30pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p30pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p30pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7297,8 +7297,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 4.2.2 4.3.1 [30] [75] [77]
 'o-p30pass2'(suite) -> [];
 'o-p30pass2'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p30pass2.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p30pass2.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -7310,8 +7310,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [31]
 'o-p31pass1'(suite) -> [];
 'o-p31pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p31pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p31pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7323,8 +7323,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 3.4 4.2.2 [31] [62] [63] [75]
 'o-p31pass2'(suite) -> [];
 'o-p31pass2'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p31pass2.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p31pass2.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -7336,8 +7336,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.4 2.5 2.6 2.7 [15] [16] [18]
 'o-p43pass1'(suite) -> [];
 'o-p43pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p43pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p43pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7349,8 +7349,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'o-p45pass1'(suite) -> [];
 'o-p45pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p45pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p45pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7362,8 +7362,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 3.2.1 3.2.2 [45] [46] [47] [51]
 'o-p46pass1'(suite) -> [];
 'o-p46pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p46pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p46pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7375,8 +7375,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 3.2.1 [45] [46] [47] 
 'o-p47pass1'(suite) -> [];
 'o-p47pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p47pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p47pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7388,8 +7388,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 3.2.1 [45] [46] [47]
 'o-p48pass1'(suite) -> [];
 'o-p48pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p48pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p48pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7401,8 +7401,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 3.2.1 [45] [46] [47]
 'o-p49pass1'(suite) -> [];
 'o-p49pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p49pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p49pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7414,8 +7414,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 3.2.1 [45] [46] [47]
 'o-p50pass1'(suite) -> [];
 'o-p50pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p50pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p50pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7427,8 +7427,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'o-p51pass1'(suite) -> [];
 'o-p51pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p51pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7440,8 +7440,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [52]
 'o-p52pass1'(suite) -> [];
 'o-p52pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p52pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p52pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7453,8 +7453,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [53]
 'o-p53pass1'(suite) -> [];
 'o-p53pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p53pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p53pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7466,8 +7466,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [54]
 'o-p54pass1'(suite) -> [];
 'o-p54pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p54pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p54pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7479,8 +7479,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [55]
 'o-p55pass1'(suite) -> [];
 'o-p55pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p55pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p55pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7492,8 +7492,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [56]
 'o-p56pass1'(suite) -> [];
 'o-p56pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p56pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p56pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7505,8 +7505,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [57]
 'o-p57pass1'(suite) -> [];
 'o-p57pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p57pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p57pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7518,8 +7518,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [58]
 'o-p58pass1'(suite) -> [];
 'o-p58pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p58pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7531,8 +7531,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [59]
 'o-p59pass1'(suite) -> [];
 'o-p59pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p59pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p59pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7544,8 +7544,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2 [60]
 'o-p60pass1'(suite) -> [];
 'o-p60pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p60pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p60pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7557,8 +7557,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [61]
 'o-p61pass1'(suite) -> [];
 'o-p61pass1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p61pass1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p61pass1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -7570,8 +7570,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [62]
 'o-p62pass1'(suite) -> [];
 'o-p62pass1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p62pass1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p62pass1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -7583,8 +7583,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [63]
 'o-p63pass1'(suite) -> [];
 'o-p63pass1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p63pass1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p63pass1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -7596,8 +7596,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [64]
 'o-p64pass1'(suite) -> [];
 'o-p64pass1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p64pass1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p64pass1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -7609,8 +7609,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'o-p68pass1'(suite) -> [];
 'o-p68pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p68pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p68pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7622,8 +7622,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [69]
 'o-p69pass1'(suite) -> [];
 'o-p69pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p69pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p69pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7635,8 +7635,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [70]
 'o-p70pass1'(suite) -> [];
 'o-p70pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p70pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p70pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7648,8 +7648,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [71]
 'o-p71pass1'(suite) -> [];
 'o-p71pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p71pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p71pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7661,8 +7661,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [72]
 'o-p72pass1'(suite) -> [];
 'o-p72pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p72pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p72pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7674,8 +7674,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [73]
 'o-p73pass1'(suite) -> [];
 'o-p73pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p73pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p73pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7687,8 +7687,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [76]
 'o-p76pass1'(suite) -> [];
 'o-p76pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p76pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p76pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -7700,8 +7700,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.1 [1]
 'o-p01pass1'(suite) -> [];
 'o-p01pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p01pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p01pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7713,8 +7713,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.1 [1]
 'o-p01pass3'(suite) -> [];
 'o-p01pass3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p01pass3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p01pass3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7726,8 +7726,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03pass1'(suite) -> [];
 'o-p03pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7739,8 +7739,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [4]
 'o-p04pass1'(suite) -> [];
 'o-p04pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p04pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p04pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7752,8 +7752,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [5]
 'o-p05pass1'(suite) -> [];
 'o-p05pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p05pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p05pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7765,8 +7765,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [6]
 'o-p06fail1'(suite) -> [];
 'o-p06fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p06fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p06fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7778,8 +7778,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [8]
 'o-p08fail1'(suite) -> [];
 'o-p08fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p08fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p08fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7791,8 +7791,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [8]
 'o-p08fail2'(suite) -> [];
 'o-p08fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p08fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p08fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7804,8 +7804,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [10]
 'o-p10pass1'(suite) -> [];
 'o-p10pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p10pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p10pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7817,8 +7817,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.4 [14]
 'o-p14pass1'(suite) -> [];
 'o-p14pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p14pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p14pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7830,8 +7830,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5 [15]
 'o-p15pass1'(suite) -> [];
 'o-p15pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p15pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p15pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7843,8 +7843,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [16] [17]
 'o-p16pass1'(suite) -> [];
 'o-p16pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p16pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p16pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7856,8 +7856,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [16]
 'o-p16pass2'(suite) -> [];
 'o-p16pass2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p16pass2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p16pass2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7869,8 +7869,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [16]
 'o-p16pass3'(suite) -> [];
 'o-p16pass3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p16pass3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p16pass3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7882,8 +7882,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7 [18]
 'o-p18pass1'(suite) -> [];
 'o-p18pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p18pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p18pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7895,8 +7895,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [22]
 'o-p22pass1'(suite) -> [];
 'o-p22pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p22pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7908,8 +7908,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [22]
 'o-p22pass2'(suite) -> [];
 'o-p22pass2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p22pass2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22pass2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7921,8 +7921,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [22]
 'o-p22pass3'(suite) -> [];
 'o-p22pass3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p22pass3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22pass3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7934,8 +7934,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [23]
 'o-p23pass1'(suite) -> [];
 'o-p23pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p23pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7947,8 +7947,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [23]
 'o-p23pass2'(suite) -> [];
 'o-p23pass2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p23pass2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23pass2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7960,8 +7960,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [23]
 'o-p23pass3'(suite) -> [];
 'o-p23pass3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p23pass3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23pass3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7973,8 +7973,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [23]
 'o-p23pass4'(suite) -> [];
 'o-p23pass4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p23pass4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23pass4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7986,8 +7986,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [24]
 'o-p24pass1'(suite) -> [];
 'o-p24pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p24pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p24pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -7999,8 +7999,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [24]
 'o-p24pass2'(suite) -> [];
 'o-p24pass2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p24pass2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p24pass2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8012,8 +8012,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [24]
 'o-p24pass3'(suite) -> [];
 'o-p24pass3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p24pass3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p24pass3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8025,8 +8025,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [24]
 'o-p24pass4'(suite) -> [];
 'o-p24pass4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p24pass4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p24pass4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8038,8 +8038,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [25]
 'o-p25pass1'(suite) -> [];
 'o-p25pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p25pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p25pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8051,8 +8051,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [25]
 'o-p25pass2'(suite) -> [];
 'o-p25pass2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p25pass2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p25pass2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8064,8 +8064,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [26]
 'o-p26pass1'(suite) -> [];
 'o-p26pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p26pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p26pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8077,8 +8077,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [27]
 'o-p27pass1'(suite) -> [];
 'o-p27pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p27pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p27pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8090,8 +8090,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [27]
 'o-p27pass2'(suite) -> [];
 'o-p27pass2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p27pass2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p27pass2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8103,8 +8103,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [27]
 'o-p27pass3'(suite) -> [];
 'o-p27pass3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p27pass3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p27pass3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8116,8 +8116,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [27]
 'o-p27pass4'(suite) -> [];
 'o-p27pass4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p27pass4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p27pass4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8129,8 +8129,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9 [32]
 'o-p32pass1'(suite) -> [];
 'o-p32pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p32pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p32pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8142,8 +8142,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9 [32]
 'o-p32pass2'(suite) -> [];
 'o-p32pass2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p32pass2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p32pass2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8155,8 +8155,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3 3.1 [39] [44]
 'o-p39pass1'(suite) -> [];
 'o-p39pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p39pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p39pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8168,8 +8168,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3 3.1 [39] [43]
 'o-p39pass2'(suite) -> [];
 'o-p39pass2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p39pass2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p39pass2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8181,8 +8181,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40]
 'o-p40pass1'(suite) -> [];
 'o-p40pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p40pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8194,8 +8194,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40]
 'o-p40pass2'(suite) -> [];
 'o-p40pass2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p40pass2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40pass2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8207,8 +8207,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40] [41]
 'o-p40pass3'(suite) -> [];
 'o-p40pass3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p40pass3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40pass3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8220,8 +8220,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40]
 'o-p40pass4'(suite) -> [];
 'o-p40pass4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p40pass4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40pass4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8233,8 +8233,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [41]
 'o-p41pass1'(suite) -> [];
 'o-p41pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p41pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p41pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8246,8 +8246,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [41]
 'o-p41pass2'(suite) -> [];
 'o-p41pass2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p41pass2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p41pass2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8259,8 +8259,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [42]
 'o-p42pass1'(suite) -> [];
 'o-p42pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p42pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p42pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8272,8 +8272,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [42]
 'o-p42pass2'(suite) -> [];
 'o-p42pass2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p42pass2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p42pass2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8285,8 +8285,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'o-p44pass1'(suite) -> [];
 'o-p44pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p44pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8298,8 +8298,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'o-p44pass2'(suite) -> [];
 'o-p44pass2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p44pass2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44pass2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8311,8 +8311,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'o-p44pass3'(suite) -> [];
 'o-p44pass3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p44pass3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44pass3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8324,8 +8324,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'o-p44pass4'(suite) -> [];
 'o-p44pass4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p44pass4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44pass4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8337,8 +8337,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'o-p44pass5'(suite) -> [];
 'o-p44pass5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p44pass5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44pass5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8350,8 +8350,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'o-p66pass1'(suite) -> [];
 'o-p66pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p66pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p66pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8363,8 +8363,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [74]
 'o-p74pass1'(suite) -> [];
 'o-p74pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p74pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p74pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8376,8 +8376,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'o-p75pass1'(suite) -> [];
 'o-p75pass1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p75pass1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p75pass1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8389,8 +8389,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [58] [59] Errata [E2]
 'o-e2'(suite) -> [];
 'o-e2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","e2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","e2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -8402,8 +8402,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.1 [1]
 'o-p01fail1'(suite) -> [];
 'o-p01fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p01fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p01fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8415,8 +8415,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.1 [1]
 'o-p01fail2'(suite) -> [];
 'o-p01fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p01fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p01fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8428,8 +8428,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.1 [1]
 'o-p01fail3'(suite) -> [];
 'o-p01fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p01fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p01fail3.xml"]),
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
@@ -8444,8 +8444,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.1 [1]
 'o-p01fail4'(suite) -> [];
 'o-p01fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p01fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p01fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8457,8 +8457,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail1'(suite) -> [];
 'o-p02fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8470,8 +8470,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail10'(suite) -> [];
 'o-p02fail10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8483,8 +8483,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail11'(suite) -> [];
 'o-p02fail11'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail11.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail11.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8496,8 +8496,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail12'(suite) -> [];
 'o-p02fail12'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail12.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail12.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8509,8 +8509,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail13'(suite) -> [];
 'o-p02fail13'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail13.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail13.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8522,8 +8522,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail14'(suite) -> [];
 'o-p02fail14'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail14.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail14.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8535,8 +8535,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail15'(suite) -> [];
 'o-p02fail15'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail15.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail15.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8548,8 +8548,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail16'(suite) -> [];
 'o-p02fail16'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail16.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail16.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8561,8 +8561,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail17'(suite) -> [];
 'o-p02fail17'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail17.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail17.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8574,8 +8574,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail18'(suite) -> [];
 'o-p02fail18'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail18.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail18.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8587,8 +8587,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail19'(suite) -> [];
 'o-p02fail19'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail19.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail19.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8600,8 +8600,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail2'(suite) -> [];
 'o-p02fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8613,8 +8613,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail20'(suite) -> [];
 'o-p02fail20'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail20.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail20.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8626,8 +8626,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail21'(suite) -> [];
 'o-p02fail21'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail21.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail21.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8639,8 +8639,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail22'(suite) -> [];
 'o-p02fail22'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail22.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail22.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8652,8 +8652,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail23'(suite) -> [];
 'o-p02fail23'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail23.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail23.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8665,8 +8665,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail24'(suite) -> [];
 'o-p02fail24'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail24.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail24.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8678,8 +8678,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail25'(suite) -> [];
 'o-p02fail25'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail25.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail25.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8691,8 +8691,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail26'(suite) -> [];
 'o-p02fail26'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail26.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail26.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8704,8 +8704,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail27'(suite) -> [];
 'o-p02fail27'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail27.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail27.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8717,8 +8717,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail28'(suite) -> [];
 'o-p02fail28'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail28.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail28.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8730,8 +8730,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail29'(suite) -> [];
 'o-p02fail29'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail29.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail29.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8743,8 +8743,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail3'(suite) -> [];
 'o-p02fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8756,8 +8756,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail30'(suite) -> [];
 'o-p02fail30'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail30.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail30.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8769,8 +8769,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail31'(suite) -> [];
 'o-p02fail31'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail31.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail31.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8782,8 +8782,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail4'(suite) -> [];
 'o-p02fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8795,8 +8795,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail5'(suite) -> [];
 'o-p02fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8808,8 +8808,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail6'(suite) -> [];
 'o-p02fail6'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail6.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail6.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8821,8 +8821,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail7'(suite) -> [];
 'o-p02fail7'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail7.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail7.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8834,8 +8834,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail8'(suite) -> [];
 'o-p02fail8'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail8.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail8.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8847,8 +8847,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2 [2]
 'o-p02fail9'(suite) -> [];
 'o-p02fail9'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p02fail9.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p02fail9.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8860,8 +8860,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail1'(suite) -> [];
 'o-p03fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8873,8 +8873,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail10'(suite) -> [];
 'o-p03fail10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8886,8 +8886,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail11'(suite) -> [];
 'o-p03fail11'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail11.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail11.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8899,8 +8899,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail12'(suite) -> [];
 'o-p03fail12'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail12.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail12.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8912,8 +8912,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail13'(suite) -> [];
 'o-p03fail13'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail13.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail13.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8925,8 +8925,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail14'(suite) -> [];
 'o-p03fail14'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail14.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail14.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8938,8 +8938,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail15'(suite) -> [];
 'o-p03fail15'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail15.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail15.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8951,8 +8951,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail16'(suite) -> [];
 'o-p03fail16'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail16.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail16.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8964,8 +8964,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail17'(suite) -> [];
 'o-p03fail17'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail17.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail17.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8977,8 +8977,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail18'(suite) -> [];
 'o-p03fail18'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail18.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail18.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -8990,8 +8990,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail19'(suite) -> [];
 'o-p03fail19'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail19.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail19.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9003,8 +9003,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail2'(suite) -> [];
 'o-p03fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9016,8 +9016,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail20'(suite) -> [];
 'o-p03fail20'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail20.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail20.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9029,8 +9029,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail21'(suite) -> [];
 'o-p03fail21'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail21.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail21.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9042,8 +9042,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail22'(suite) -> [];
 'o-p03fail22'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail22.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail22.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9055,8 +9055,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail23'(suite) -> [];
 'o-p03fail23'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail23.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail23.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9068,8 +9068,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail24'(suite) -> [];
 'o-p03fail24'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail24.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail24.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9081,8 +9081,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail25'(suite) -> [];
 'o-p03fail25'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail25.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail25.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9094,8 +9094,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail26'(suite) -> [];
 'o-p03fail26'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail26.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail26.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9107,8 +9107,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail27'(suite) -> [];
 'o-p03fail27'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail27.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail27.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9120,8 +9120,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail28'(suite) -> [];
 'o-p03fail28'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail28.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail28.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9133,8 +9133,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail29'(suite) -> [];
 'o-p03fail29'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail29.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail29.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9146,8 +9146,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail3'(suite) -> [];
 'o-p03fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9159,8 +9159,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail4'(suite) -> [];
 'o-p03fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9172,8 +9172,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail5'(suite) -> [];
 'o-p03fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9185,8 +9185,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail7'(suite) -> [];
 'o-p03fail7'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail7.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail7.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9198,8 +9198,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail8'(suite) -> [];
 'o-p03fail8'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail8.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail8.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9211,8 +9211,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [3]
 'o-p03fail9'(suite) -> [];
 'o-p03fail9'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p03fail9.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p03fail9.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9224,8 +9224,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [4]
 'o-p04fail1'(suite) -> [];
 'o-p04fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p04fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p04fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9237,8 +9237,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [4]
 'o-p04fail2'(suite) -> [];
 'o-p04fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p04fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p04fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9250,8 +9250,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [4]
 'o-p04fail3'(suite) -> [];
 'o-p04fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p04fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p04fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9263,8 +9263,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [5]
 'o-p05fail1'(suite) -> [];
 'o-p05fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p05fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p05fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9276,8 +9276,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [5]
 'o-p05fail2'(suite) -> [];
 'o-p05fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p05fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p05fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9289,8 +9289,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [5]
 'o-p05fail3'(suite) -> [];
 'o-p05fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p05fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p05fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9302,8 +9302,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [5]
 'o-p05fail4'(suite) -> [];
 'o-p05fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p05fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p05fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9315,8 +9315,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [5]
 'o-p05fail5'(suite) -> [];
 'o-p05fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p05fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p05fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9328,8 +9328,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [9]
 'o-p09fail1'(suite) -> [];
 'o-p09fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p09fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p09fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9341,8 +9341,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [9]
 'o-p09fail2'(suite) -> [];
 'o-p09fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p09fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p09fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9354,8 +9354,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [9]
 'o-p09fail3'(suite) -> [];
 'o-p09fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p09fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p09fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9367,8 +9367,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [9]
 'o-p09fail4'(suite) -> [];
 'o-p09fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p09fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p09fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9380,8 +9380,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [9]
 'o-p09fail5'(suite) -> [];
 'o-p09fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p09fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p09fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9393,8 +9393,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [10]
 'o-p10fail1'(suite) -> [];
 'o-p10fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p10fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p10fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9406,8 +9406,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [10]
 'o-p10fail2'(suite) -> [];
 'o-p10fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p10fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p10fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9419,8 +9419,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [10]
 'o-p10fail3'(suite) -> [];
 'o-p10fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p10fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p10fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9432,8 +9432,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [11]
 'o-p11fail1'(suite) -> [];
 'o-p11fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p11fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p11fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9445,8 +9445,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [11]
 'o-p11fail2'(suite) -> [];
 'o-p11fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p11fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p11fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9458,8 +9458,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [12]
 'o-p12fail1'(suite) -> [];
 'o-p12fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p12fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9471,8 +9471,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [12]
 'o-p12fail2'(suite) -> [];
 'o-p12fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p12fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9484,8 +9484,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [12]
 'o-p12fail3'(suite) -> [];
 'o-p12fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p12fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9497,8 +9497,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [12]
 'o-p12fail4'(suite) -> [];
 'o-p12fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p12fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9510,8 +9510,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [12]
 'o-p12fail5'(suite) -> [];
 'o-p12fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p12fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9523,8 +9523,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [12]
 'o-p12fail6'(suite) -> [];
 'o-p12fail6'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p12fail6.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12fail6.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9536,8 +9536,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3 [13]
 'o-p12fail7'(suite) -> [];
 'o-p12fail7'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p12fail7.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p12fail7.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9549,8 +9549,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.4 [14]
 'o-p14fail1'(suite) -> [];
 'o-p14fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p14fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p14fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9562,8 +9562,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.4 [14]
 'o-p14fail2'(suite) -> [];
 'o-p14fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p14fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p14fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9575,8 +9575,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.4 [14]
 'o-p14fail3'(suite) -> [];
 'o-p14fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p14fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p14fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9588,8 +9588,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5 [15]
 'o-p15fail1'(suite) -> [];
 'o-p15fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p15fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p15fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9601,8 +9601,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5 [15]
 'o-p15fail2'(suite) -> [];
 'o-p15fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p15fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p15fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9614,8 +9614,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5 [15]
 'o-p15fail3'(suite) -> [];
 'o-p15fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p15fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p15fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9627,8 +9627,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [16]
 'o-p16fail1'(suite) -> [];
 'o-p16fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p16fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p16fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9640,8 +9640,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [16]
 'o-p16fail2'(suite) -> [];
 'o-p16fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p16fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p16fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9653,8 +9653,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6 [16]
 'o-p16fail3'(suite) -> [];
 'o-p16fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p16fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p16fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9666,8 +9666,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7 [18]
 'o-p18fail1'(suite) -> [];
 'o-p18fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p18fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p18fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9679,8 +9679,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7 [18]
 'o-p18fail2'(suite) -> [];
 'o-p18fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p18fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p18fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9692,8 +9692,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7 [18]
 'o-p18fail3'(suite) -> [];
 'o-p18fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p18fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p18fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9705,8 +9705,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [22]
 'o-p22fail1'(suite) -> [];
 'o-p22fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p22fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9718,8 +9718,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [22]
 'o-p22fail2'(suite) -> [];
 'o-p22fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p22fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p22fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9731,8 +9731,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [23]
 'o-p23fail1'(suite) -> [];
 'o-p23fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p23fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9744,8 +9744,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [23]
 'o-p23fail2'(suite) -> [];
 'o-p23fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p23fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9757,8 +9757,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [23]
 'o-p23fail3'(suite) -> [];
 'o-p23fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p23fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9770,8 +9770,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [23]
 'o-p23fail4'(suite) -> [];
 'o-p23fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p23fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9783,8 +9783,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [23]
 'o-p23fail5'(suite) -> [];
 'o-p23fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p23fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p23fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9796,8 +9796,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [24]
 'o-p24fail1'(suite) -> [];
 'o-p24fail1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p24fail1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p24fail1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -9809,8 +9809,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [24]
 'o-p24fail2'(suite) -> [];
 'o-p24fail2'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p24fail2.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p24fail2.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -9822,8 +9822,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [25]
 'o-p25fail1'(suite) -> [];
 'o-p25fail1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p25fail1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p25fail1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -9835,8 +9835,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [26]
 'o-p26fail1'(suite) -> [];
 'o-p26fail1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p26fail1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p26fail1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -9848,8 +9848,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [26]
 'o-p26fail2'(suite) -> [];
 'o-p26fail2'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p26fail2.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p26fail2.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -9861,8 +9861,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [27]
 'o-p27fail1'(suite) -> [];
 'o-p27fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p27fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p27fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9874,8 +9874,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [28]
 'o-p28fail1'(suite) -> [];
 'o-p28fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p28fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p28fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9887,8 +9887,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [29]
 'o-p29fail1'(suite) -> [];
 'o-p29fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p29fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p29fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9900,8 +9900,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [30]
 'o-p30fail1'(suite) -> [];
 'o-p30fail1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p30fail1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p30fail1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -9913,8 +9913,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [31]
 'o-p31fail1'(suite) -> [];
 'o-p31fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p31fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p31fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9926,8 +9926,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9 [32]
 'o-p32fail1'(suite) -> [];
 'o-p32fail1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p32fail1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p32fail1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -9939,8 +9939,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9 [32]
 'o-p32fail2'(suite) -> [];
 'o-p32fail2'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p32fail2.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p32fail2.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -9952,8 +9952,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9 [32]
 'o-p32fail3'(suite) -> [];
 'o-p32fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p32fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p32fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9965,8 +9965,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9 [32]
 'o-p32fail4'(suite) -> [];
 'o-p32fail4'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p32fail4.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p32fail4.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -9978,8 +9978,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9 [32]
 'o-p32fail5'(suite) -> [];
 'o-p32fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p32fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p32fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -9991,8 +9991,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3 [39]
 'o-p39fail1'(suite) -> [];
 'o-p39fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p39fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p39fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10004,8 +10004,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3 [39]
 'o-p39fail2'(suite) -> [];
 'o-p39fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p39fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p39fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10017,8 +10017,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3 [39]
 'o-p39fail3'(suite) -> [];
 'o-p39fail3'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p39fail3.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p39fail3.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10030,8 +10030,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [23]
 'o-p39fail4'(suite) -> [];
 'o-p39fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p39fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p39fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10043,8 +10043,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8 [23]
 'o-p39fail5'(suite) -> [];
 'o-p39fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p39fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p39fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10056,8 +10056,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40]
 'o-p40fail1'(suite) -> [];
 'o-p40fail1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p40fail1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40fail1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10069,8 +10069,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40]
 'o-p40fail2'(suite) -> [];
 'o-p40fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p40fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10082,8 +10082,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40]
 'o-p40fail3'(suite) -> [];
 'o-p40fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p40fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10095,8 +10095,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [40]
 'o-p40fail4'(suite) -> [];
 'o-p40fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p40fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p40fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10108,8 +10108,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [41]
 'o-p41fail1'(suite) -> [];
 'o-p41fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p41fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p41fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10121,8 +10121,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [41]
 'o-p41fail2'(suite) -> [];
 'o-p41fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p41fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p41fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10134,8 +10134,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [41]
 'o-p41fail3'(suite) -> [];
 'o-p41fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p41fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p41fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10147,8 +10147,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [42]
 'o-p42fail1'(suite) -> [];
 'o-p42fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p42fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p42fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10160,8 +10160,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [42]
 'o-p42fail2'(suite) -> [];
 'o-p42fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p42fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p42fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10173,8 +10173,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [42]
 'o-p42fail3'(suite) -> [];
 'o-p42fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p42fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p42fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10186,8 +10186,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [43]
 'o-p43fail1'(suite) -> [];
 'o-p43fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p43fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p43fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10199,8 +10199,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [43]
 'o-p43fail2'(suite) -> [];
 'o-p43fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p43fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p43fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10212,8 +10212,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [43]
 'o-p43fail3'(suite) -> [];
 'o-p43fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p43fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p43fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10225,8 +10225,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'o-p44fail1'(suite) -> [];
 'o-p44fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p44fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10238,8 +10238,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'o-p44fail2'(suite) -> [];
 'o-p44fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p44fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10251,8 +10251,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'o-p44fail3'(suite) -> [];
 'o-p44fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p44fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10264,8 +10264,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'o-p44fail4'(suite) -> [];
 'o-p44fail4'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p44fail4.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44fail4.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10277,8 +10277,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1 [44]
 'o-p44fail5'(suite) -> [];
 'o-p44fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p44fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p44fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10290,8 +10290,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'o-p45fail1'(suite) -> [];
 'o-p45fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p45fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p45fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10303,8 +10303,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'o-p45fail2'(suite) -> [];
 'o-p45fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p45fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p45fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10316,8 +10316,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'o-p45fail3'(suite) -> [];
 'o-p45fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p45fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p45fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10329,8 +10329,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [45]
 'o-p45fail4'(suite) -> [];
 'o-p45fail4'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p45fail4.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p45fail4.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10342,8 +10342,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [46]
 'o-p46fail1'(suite) -> [];
 'o-p46fail1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p46fail1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p46fail1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10355,8 +10355,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [46]
 'o-p46fail2'(suite) -> [];
 'o-p46fail2'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p46fail2.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p46fail2.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10368,8 +10368,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [46]
 'o-p46fail3'(suite) -> [];
 'o-p46fail3'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p46fail3.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p46fail3.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10381,8 +10381,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [46]
 'o-p46fail4'(suite) -> [];
 'o-p46fail4'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p46fail4.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p46fail4.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10394,8 +10394,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [46]
 'o-p46fail5'(suite) -> [];
 'o-p46fail5'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p46fail5.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p46fail5.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10407,8 +10407,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2 [46]
 'o-p46fail6'(suite) -> [];
 'o-p46fail6'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p46fail6.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p46fail6.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10420,8 +10420,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [47]
 'o-p47fail1'(suite) -> [];
 'o-p47fail1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p47fail1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p47fail1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10433,8 +10433,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [47]
 'o-p47fail2'(suite) -> [];
 'o-p47fail2'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p47fail2.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p47fail2.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10446,8 +10446,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [47]
 'o-p47fail3'(suite) -> [];
 'o-p47fail3'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p47fail3.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p47fail3.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10459,8 +10459,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [47]
 'o-p47fail4'(suite) -> [];
 'o-p47fail4'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p47fail4.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p47fail4.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10472,8 +10472,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [48]
 'o-p48fail1'(suite) -> [];
 'o-p48fail1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p48fail1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p48fail1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10485,8 +10485,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [48]
 'o-p48fail2'(suite) -> [];
 'o-p48fail2'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p48fail2.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p48fail2.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10498,8 +10498,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [49]
 'o-p49fail1'(suite) -> [];
 'o-p49fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p49fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p49fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10511,8 +10511,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1 [50]
 'o-p50fail1'(suite) -> [];
 'o-p50fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p50fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p50fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10524,8 +10524,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'o-p51fail1'(suite) -> [];
 'o-p51fail1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p51fail1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51fail1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10537,8 +10537,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'o-p51fail2'(suite) -> [];
 'o-p51fail2'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p51fail2.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51fail2.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10550,8 +10550,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'o-p51fail3'(suite) -> [];
 'o-p51fail3'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p51fail3.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51fail3.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10563,8 +10563,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'o-p51fail4'(suite) -> [];
 'o-p51fail4'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p51fail4.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51fail4.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10576,8 +10576,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'o-p51fail5'(suite) -> [];
 'o-p51fail5'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p51fail5.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51fail5.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10589,8 +10589,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'o-p51fail6'(suite) -> [];
 'o-p51fail6'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p51fail6.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51fail6.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10602,8 +10602,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2 [51]
 'o-p51fail7'(suite) -> [];
 'o-p51fail7'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p51fail7.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p51fail7.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10615,8 +10615,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [52]
 'o-p52fail1'(suite) -> [];
 'o-p52fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p52fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p52fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10628,8 +10628,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [52]
 'o-p52fail2'(suite) -> [];
 'o-p52fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p52fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p52fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10641,8 +10641,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [53]
 'o-p53fail1'(suite) -> [];
 'o-p53fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p53fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p53fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10654,8 +10654,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [53]
 'o-p53fail2'(suite) -> [];
 'o-p53fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p53fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p53fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10667,8 +10667,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [53]
 'o-p53fail3'(suite) -> [];
 'o-p53fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p53fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p53fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10680,8 +10680,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [53]
 'o-p53fail4'(suite) -> [];
 'o-p53fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p53fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p53fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10693,8 +10693,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3 [53]
 'o-p53fail5'(suite) -> [];
 'o-p53fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p53fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p53fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10706,8 +10706,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [54]
 'o-p54fail1'(suite) -> [];
 'o-p54fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p54fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p54fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10719,8 +10719,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [55]
 'o-p55fail1'(suite) -> [];
 'o-p55fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p55fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p55fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10732,8 +10732,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [56]
 'o-p56fail1'(suite) -> [];
 'o-p56fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p56fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p56fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10745,8 +10745,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [56]
 'o-p56fail2'(suite) -> [];
 'o-p56fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p56fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p56fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10758,8 +10758,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [56]
 'o-p56fail3'(suite) -> [];
 'o-p56fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p56fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p56fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10771,8 +10771,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [56]
 'o-p56fail4'(suite) -> [];
 'o-p56fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p56fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p56fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10784,8 +10784,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [56]
 'o-p56fail5'(suite) -> [];
 'o-p56fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p56fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p56fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10797,8 +10797,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [57]
 'o-p57fail1'(suite) -> [];
 'o-p57fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p57fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p57fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10810,8 +10810,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [58]
 'o-p58fail1'(suite) -> [];
 'o-p58fail1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p58fail1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10823,8 +10823,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [58]
 'o-p58fail2'(suite) -> [];
 'o-p58fail2'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p58fail2.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail2.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10836,8 +10836,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [58]
 'o-p58fail3'(suite) -> [];
 'o-p58fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p58fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10849,8 +10849,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [58]
 'o-p58fail4'(suite) -> [];
 'o-p58fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p58fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10862,8 +10862,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [58]
 'o-p58fail5'(suite) -> [];
 'o-p58fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p58fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10875,8 +10875,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [58]
 'o-p58fail6'(suite) -> [];
 'o-p58fail6'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p58fail6.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail6.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10888,8 +10888,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [58]
 'o-p58fail7'(suite) -> [];
 'o-p58fail7'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p58fail7.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail7.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10901,8 +10901,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [58]
 'o-p58fail8'(suite) -> [];
 'o-p58fail8'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p58fail8.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p58fail8.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10914,8 +10914,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [59]
 'o-p59fail1'(suite) -> [];
 'o-p59fail1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p59fail1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p59fail1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10927,8 +10927,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [59]
 'o-p59fail2'(suite) -> [];
 'o-p59fail2'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p59fail2.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p59fail2.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10940,8 +10940,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1 [59]
 'o-p59fail3'(suite) -> [];
 'o-p59fail3'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p59fail3.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p59fail3.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -10953,8 +10953,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2 [60]
 'o-p60fail1'(suite) -> [];
 'o-p60fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p60fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p60fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10966,8 +10966,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2 [60]
 'o-p60fail2'(suite) -> [];
 'o-p60fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p60fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p60fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10979,8 +10979,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2 [60]
 'o-p60fail3'(suite) -> [];
 'o-p60fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p60fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p60fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -10992,8 +10992,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2 [60]
 'o-p60fail4'(suite) -> [];
 'o-p60fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p60fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p60fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11005,8 +11005,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2 [60]
 'o-p60fail5'(suite) -> [];
 'o-p60fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p60fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p60fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11018,8 +11018,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [61]
 'o-p61fail1'(suite) -> [];
 'o-p61fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p61fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p61fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11031,8 +11031,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [62]
 'o-p62fail1'(suite) -> [];
 'o-p62fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p62fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p62fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11044,8 +11044,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [62]
 'o-p62fail2'(suite) -> [];
 'o-p62fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p62fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p62fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11057,8 +11057,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [63]
 'o-p63fail1'(suite) -> [];
 'o-p63fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p63fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p63fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11070,8 +11070,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [63]
 'o-p63fail2'(suite) -> [];
 'o-p63fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p63fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p63fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11083,8 +11083,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [64]
 'o-p64fail1'(suite) -> [];
 'o-p64fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p64fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p64fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11096,8 +11096,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.4 [64]
 'o-p64fail2'(suite) -> [];
 'o-p64fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p64fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p64fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11109,8 +11109,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'o-p66fail1'(suite) -> [];
 'o-p66fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p66fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p66fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11122,8 +11122,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'o-p66fail2'(suite) -> [];
 'o-p66fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p66fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p66fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11135,8 +11135,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'o-p66fail3'(suite) -> [];
 'o-p66fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p66fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p66fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11148,8 +11148,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'o-p66fail4'(suite) -> [];
 'o-p66fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p66fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p66fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11161,8 +11161,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'o-p66fail5'(suite) -> [];
 'o-p66fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p66fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p66fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11174,8 +11174,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [66]
 'o-p66fail6'(suite) -> [];
 'o-p66fail6'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p66fail6.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p66fail6.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11187,8 +11187,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'o-p68fail1'(suite) -> [];
 'o-p68fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p68fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p68fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11200,8 +11200,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'o-p68fail2'(suite) -> [];
 'o-p68fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p68fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p68fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11213,8 +11213,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [68]
 'o-p68fail3'(suite) -> [];
 'o-p68fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p68fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p68fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11226,8 +11226,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [69]
 'o-p69fail1'(suite) -> [];
 'o-p69fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p69fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p69fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11239,8 +11239,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [69]
 'o-p69fail2'(suite) -> [];
 'o-p69fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p69fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p69fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11252,8 +11252,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1 [69]
 'o-p69fail3'(suite) -> [];
 'o-p69fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p69fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p69fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11265,8 +11265,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [70]
 'o-p70fail1'(suite) -> [];
 'o-p70fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p70fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p70fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11278,8 +11278,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [71]
 'o-p71fail1'(suite) -> [];
 'o-p71fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p71fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p71fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11291,8 +11291,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [71]
 'o-p71fail2'(suite) -> [];
 'o-p71fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p71fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p71fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11304,8 +11304,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [71]
 'o-p71fail3'(suite) -> [];
 'o-p71fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p71fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p71fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11317,8 +11317,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [71]
 'o-p71fail4'(suite) -> [];
 'o-p71fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p71fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p71fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11330,8 +11330,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [72]
 'o-p72fail1'(suite) -> [];
 'o-p72fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p72fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p72fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11343,8 +11343,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [72]
 'o-p72fail2'(suite) -> [];
 'o-p72fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p72fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p72fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11356,8 +11356,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [72]
 'o-p72fail3'(suite) -> [];
 'o-p72fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p72fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p72fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11369,8 +11369,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [72]
 'o-p72fail4'(suite) -> [];
 'o-p72fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p72fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p72fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11382,8 +11382,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [73]
 'o-p73fail1'(suite) -> [];
 'o-p73fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p73fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p73fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11395,8 +11395,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [73]
 'o-p73fail2'(suite) -> [];
 'o-p73fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p73fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p73fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11408,8 +11408,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [73]
 'o-p73fail3'(suite) -> [];
 'o-p73fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p73fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p73fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11421,8 +11421,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [73]
 'o-p73fail4'(suite) -> [];
 'o-p73fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p73fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p73fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11434,8 +11434,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [73]
 'o-p73fail5'(suite) -> [];
 'o-p73fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p73fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p73fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11447,8 +11447,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [74]
 'o-p74fail1'(suite) -> [];
 'o-p74fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p74fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p74fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11460,8 +11460,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [74]
 'o-p74fail2'(suite) -> [];
 'o-p74fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p74fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p74fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11473,8 +11473,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2 [74]
 'o-p74fail3'(suite) -> [];
 'o-p74fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p74fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p74fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11486,8 +11486,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'o-p75fail1'(suite) -> [];
 'o-p75fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p75fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p75fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11499,8 +11499,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'o-p75fail2'(suite) -> [];
 'o-p75fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p75fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p75fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11512,8 +11512,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'o-p75fail3'(suite) -> [];
 'o-p75fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p75fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p75fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11525,8 +11525,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'o-p75fail4'(suite) -> [];
 'o-p75fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p75fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p75fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11538,8 +11538,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'o-p75fail5'(suite) -> [];
 'o-p75fail5'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p75fail5.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p75fail5.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11551,8 +11551,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [75]
 'o-p75fail6'(suite) -> [];
 'o-p75fail6'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p75fail6.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p75fail6.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11564,8 +11564,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [76]
 'o-p76fail1'(suite) -> [];
 'o-p76fail1'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p76fail1.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p76fail1.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11577,8 +11577,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [76]
 'o-p76fail2'(suite) -> [];
 'o-p76fail2'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p76fail2.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p76fail2.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11590,8 +11590,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [76]
 'o-p76fail3'(suite) -> [];
 'o-p76fail3'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p76fail3.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p76fail3.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11603,8 +11603,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2 [76]
 'o-p76fail4'(suite) -> [];
 'o-p76fail4'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"oasis","p76fail4.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p76fail4.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -11616,8 +11616,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3, 4.2.2 [11]
 'o-p11pass1'(suite) -> [];
 'o-p11pass1'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"oasis","p11pass1.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p11pass1.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "error").
 
@@ -11639,8 +11639,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-invalid-P28-ibm28i01'(suite) -> [];
 'ibm-invalid-P28-ibm28i01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P28/ibm28i01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P28/ibm28i01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11657,8 +11657,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'ibm-invalid-P32-ibm32i01'(suite) -> [];
 'ibm-invalid-P32-ibm32i01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P32/ibm32i01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P32/ibm32i01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11670,8 +11670,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'ibm-invalid-P32-ibm32i03'(suite) -> [];
 'ibm-invalid-P32-ibm32i03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P32/ibm32i03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P32/ibm32i03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11683,8 +11683,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'ibm-invalid-P32-ibm32i04'(suite) -> [];
 'ibm-invalid-P32-ibm32i04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P32/ibm32i04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P32/ibm32i04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11701,8 +11701,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'ibm-invalid-P39-ibm39i01'(suite) -> [];
 'ibm-invalid-P39-ibm39i01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P39/ibm39i01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P39/ibm39i01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11714,8 +11714,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'ibm-invalid-P39-ibm39i02'(suite) -> [];
 'ibm-invalid-P39-ibm39i02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P39/ibm39i02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P39/ibm39i02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11727,8 +11727,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'ibm-invalid-P39-ibm39i03'(suite) -> [];
 'ibm-invalid-P39-ibm39i03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P39/ibm39i03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P39/ibm39i03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11740,8 +11740,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'ibm-invalid-P39-ibm39i04'(suite) -> [];
 'ibm-invalid-P39-ibm39i04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P39/ibm39i04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P39/ibm39i04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11758,8 +11758,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-invalid-P41-ibm41i01'(suite) -> [];
 'ibm-invalid-P41-ibm41i01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P41/ibm41i01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P41/ibm41i01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11771,8 +11771,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-invalid-P41-ibm41i02'(suite) -> [];
 'ibm-invalid-P41-ibm41i02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P41/ibm41i02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P41/ibm41i02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11789,8 +11789,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'ibm-invalid-P45-ibm45i01'(suite) -> [];
 'ibm-invalid-P45-ibm45i01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P45/ibm45i01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P45/ibm45i01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11807,8 +11807,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-invalid-P49-ibm49i01'(suite) -> [];
 'ibm-invalid-P49-ibm49i01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P49/ibm49i01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P49/ibm49i01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11825,8 +11825,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-invalid-P50-ibm50i01'(suite) -> [];
 'ibm-invalid-P50-ibm50i01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P50/ibm50i01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P50/ibm50i01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11843,8 +11843,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2
 'ibm-invalid-P51-ibm51i01'(suite) -> [];
 'ibm-invalid-P51-ibm51i01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P51/ibm51i01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P51/ibm51i01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11856,8 +11856,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.2
 'ibm-invalid-P51-ibm51i03'(suite) -> [];
 'ibm-invalid-P51-ibm51i03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P51/ibm51i03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P51/ibm51i03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11874,8 +11874,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i01'(suite) -> [];
 'ibm-invalid-P56-ibm56i01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11887,8 +11887,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i02'(suite) -> [];
 'ibm-invalid-P56-ibm56i02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11900,8 +11900,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i03'(suite) -> [];
 'ibm-invalid-P56-ibm56i03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11913,8 +11913,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i05'(suite) -> [];
 'ibm-invalid-P56-ibm56i05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11926,8 +11926,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i06'(suite) -> [];
 'ibm-invalid-P56-ibm56i06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11939,8 +11939,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i07'(suite) -> [];
 'ibm-invalid-P56-ibm56i07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11952,8 +11952,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i08'(suite) -> [];
 'ibm-invalid-P56-ibm56i08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11965,8 +11965,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i09'(suite) -> [];
 'ibm-invalid-P56-ibm56i09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11978,8 +11978,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i10'(suite) -> [];
 'ibm-invalid-P56-ibm56i10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -11991,8 +11991,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i11'(suite) -> [];
 'ibm-invalid-P56-ibm56i11'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i11.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i11.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12004,8 +12004,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i12'(suite) -> [];
 'ibm-invalid-P56-ibm56i12'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i12.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i12.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12017,8 +12017,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i13'(suite) -> [];
 'ibm-invalid-P56-ibm56i13'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i13.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i13.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12030,8 +12030,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i14'(suite) -> [];
 'ibm-invalid-P56-ibm56i14'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i14.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i14.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12043,8 +12043,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i15'(suite) -> [];
 'ibm-invalid-P56-ibm56i15'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i15.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i15.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12056,8 +12056,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i16'(suite) -> [];
 'ibm-invalid-P56-ibm56i16'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i16.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i16.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12069,8 +12069,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i17'(suite) -> [];
 'ibm-invalid-P56-ibm56i17'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i17.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i17.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12082,8 +12082,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P56-ibm56i18'(suite) -> [];
 'ibm-invalid-P56-ibm56i18'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P56/ibm56i18.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P56/ibm56i18.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12100,8 +12100,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P58-ibm58i01'(suite) -> [];
 'ibm-invalid-P58-ibm58i01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P58/ibm58i01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P58/ibm58i01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12113,8 +12113,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P58-ibm58i02'(suite) -> [];
 'ibm-invalid-P58-ibm58i02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P58/ibm58i02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P58/ibm58i02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12131,8 +12131,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.1
 'ibm-invalid-P59-ibm59i01'(suite) -> [];
 'ibm-invalid-P59-ibm59i01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P59/ibm59i01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P59/ibm59i01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12149,8 +12149,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2
 'ibm-invalid-P60-ibm60i01'(suite) -> [];
 'ibm-invalid-P60-ibm60i01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P60/ibm60i01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P60/ibm60i01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12162,8 +12162,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2
 'ibm-invalid-P60-ibm60i02'(suite) -> [];
 'ibm-invalid-P60-ibm60i02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P60/ibm60i02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P60/ibm60i02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12175,8 +12175,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2
 'ibm-invalid-P60-ibm60i03'(suite) -> [];
 'ibm-invalid-P60-ibm60i03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P60/ibm60i03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P60/ibm60i03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12188,8 +12188,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.3.2
 'ibm-invalid-P60-ibm60i04'(suite) -> [];
 'ibm-invalid-P60-ibm60i04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P60/ibm60i04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P60/ibm60i04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12206,8 +12206,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1
 'ibm-invalid-P68-ibm68i01'(suite) -> [];
 'ibm-invalid-P68-ibm68i01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P68/ibm68i01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P68/ibm68i01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -12219,8 +12219,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1
 'ibm-invalid-P68-ibm68i02'(suite) -> [];
 'ibm-invalid-P68-ibm68i02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P68/ibm68i02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P68/ibm68i02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -12232,8 +12232,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1
 'ibm-invalid-P68-ibm68i03'(suite) -> [];
 'ibm-invalid-P68-ibm68i03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P68/ibm68i03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P68/ibm68i03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -12245,8 +12245,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1
 'ibm-invalid-P68-ibm68i04'(suite) -> [];
 'ibm-invalid-P68-ibm68i04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P68/ibm68i04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P68/ibm68i04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -12263,8 +12263,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1
 'ibm-invalid-P69-ibm69i01'(suite) -> [];
 'ibm-invalid-P69-ibm69i01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P69/ibm69i01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P69/ibm69i01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -12276,8 +12276,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1
 'ibm-invalid-P69-ibm69i02'(suite) -> [];
 'ibm-invalid-P69-ibm69i02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P69/ibm69i02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P69/ibm69i02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -12289,8 +12289,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1
 'ibm-invalid-P69-ibm69i03'(suite) -> [];
 'ibm-invalid-P69-ibm69i03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P69/ibm69i03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P69/ibm69i03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -12302,8 +12302,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.1
 'ibm-invalid-P69-ibm69i04'(suite) -> [];
 'ibm-invalid-P69-ibm69i04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P69/ibm69i04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P69/ibm69i04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -12320,8 +12320,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 4.2.2
 'ibm-invalid-P76-ibm76i01'(suite) -> [];
 'ibm-invalid-P76-ibm76i01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","invalid/P76/ibm76i01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","invalid/P76/ibm76i01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "invalid").
 
@@ -12343,8 +12343,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.1
 'ibm-not-wf-P01-ibm01n01'(suite) -> [];
 'ibm-not-wf-P01-ibm01n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P01/ibm01n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P01/ibm01n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12356,8 +12356,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.1
 'ibm-not-wf-P01-ibm01n02'(suite) -> [];
 'ibm-not-wf-P01-ibm01n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P01/ibm01n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P01/ibm01n02.xml"]),
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
@@ -12372,8 +12372,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.1
 'ibm-not-wf-P01-ibm01n03'(suite) -> [];
 'ibm-not-wf-P01-ibm01n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P01/ibm01n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P01/ibm01n03.xml"]),
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
@@ -12393,8 +12393,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n01'(suite) -> [];
 'ibm-not-wf-P02-ibm02n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12406,8 +12406,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n02'(suite) -> [];
 'ibm-not-wf-P02-ibm02n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12419,8 +12419,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n03'(suite) -> [];
 'ibm-not-wf-P02-ibm02n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12432,8 +12432,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n04'(suite) -> [];
 'ibm-not-wf-P02-ibm02n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12445,8 +12445,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n05'(suite) -> [];
 'ibm-not-wf-P02-ibm02n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12458,8 +12458,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n06'(suite) -> [];
 'ibm-not-wf-P02-ibm02n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12471,8 +12471,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n07'(suite) -> [];
 'ibm-not-wf-P02-ibm02n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12484,8 +12484,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n08'(suite) -> [];
 'ibm-not-wf-P02-ibm02n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12497,8 +12497,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n09'(suite) -> [];
 'ibm-not-wf-P02-ibm02n09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12510,8 +12510,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n10'(suite) -> [];
 'ibm-not-wf-P02-ibm02n10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12523,8 +12523,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n11'(suite) -> [];
 'ibm-not-wf-P02-ibm02n11'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n11.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n11.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12536,8 +12536,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n12'(suite) -> [];
 'ibm-not-wf-P02-ibm02n12'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n12.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n12.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12549,8 +12549,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n13'(suite) -> [];
 'ibm-not-wf-P02-ibm02n13'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n13.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n13.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12562,8 +12562,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n14'(suite) -> [];
 'ibm-not-wf-P02-ibm02n14'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n14.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n14.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12575,8 +12575,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n15'(suite) -> [];
 'ibm-not-wf-P02-ibm02n15'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n15.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n15.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12588,8 +12588,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n16'(suite) -> [];
 'ibm-not-wf-P02-ibm02n16'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n16.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n16.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12601,8 +12601,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n17'(suite) -> [];
 'ibm-not-wf-P02-ibm02n17'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n17.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n17.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12614,8 +12614,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n18'(suite) -> [];
 'ibm-not-wf-P02-ibm02n18'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n18.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n18.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12627,8 +12627,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n19'(suite) -> [];
 'ibm-not-wf-P02-ibm02n19'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n19.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n19.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12640,8 +12640,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n20'(suite) -> [];
 'ibm-not-wf-P02-ibm02n20'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n20.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n20.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12653,8 +12653,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n21'(suite) -> [];
 'ibm-not-wf-P02-ibm02n21'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n21.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n21.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12666,8 +12666,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n22'(suite) -> [];
 'ibm-not-wf-P02-ibm02n22'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n22.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n22.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12679,8 +12679,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n23'(suite) -> [];
 'ibm-not-wf-P02-ibm02n23'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n23.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n23.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12692,8 +12692,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n24'(suite) -> [];
 'ibm-not-wf-P02-ibm02n24'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n24.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n24.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12705,8 +12705,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n25'(suite) -> [];
 'ibm-not-wf-P02-ibm02n25'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n25.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n25.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12718,8 +12718,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n26'(suite) -> [];
 'ibm-not-wf-P02-ibm02n26'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n26.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n26.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12731,8 +12731,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n27'(suite) -> [];
 'ibm-not-wf-P02-ibm02n27'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n27.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n27.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12744,8 +12744,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n28'(suite) -> [];
 'ibm-not-wf-P02-ibm02n28'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n28.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n28.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12757,8 +12757,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n29'(suite) -> [];
 'ibm-not-wf-P02-ibm02n29'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n29.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n29.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12770,8 +12770,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n30'(suite) -> [];
 'ibm-not-wf-P02-ibm02n30'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n30.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n30.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12783,8 +12783,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n31'(suite) -> [];
 'ibm-not-wf-P02-ibm02n31'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n31.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n31.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12796,8 +12796,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n32'(suite) -> [];
 'ibm-not-wf-P02-ibm02n32'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n32.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n32.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12809,8 +12809,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.2
 'ibm-not-wf-P02-ibm02n33'(suite) -> [];
 'ibm-not-wf-P02-ibm02n33'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P02/ibm02n33.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P02/ibm02n33.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12827,8 +12827,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P03-ibm03n01'(suite) -> [];
 'ibm-not-wf-P03-ibm03n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P03/ibm03n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P03/ibm03n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12845,8 +12845,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n01'(suite) -> [];
 'ibm-not-wf-P04-ibm04n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12858,8 +12858,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n02'(suite) -> [];
 'ibm-not-wf-P04-ibm04n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12871,8 +12871,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n03'(suite) -> [];
 'ibm-not-wf-P04-ibm04n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12884,8 +12884,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n04'(suite) -> [];
 'ibm-not-wf-P04-ibm04n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12897,8 +12897,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n05'(suite) -> [];
 'ibm-not-wf-P04-ibm04n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12910,8 +12910,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n06'(suite) -> [];
 'ibm-not-wf-P04-ibm04n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12923,8 +12923,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n07'(suite) -> [];
 'ibm-not-wf-P04-ibm04n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12936,8 +12936,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n08'(suite) -> [];
 'ibm-not-wf-P04-ibm04n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12949,8 +12949,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n09'(suite) -> [];
 'ibm-not-wf-P04-ibm04n09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12962,8 +12962,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n10'(suite) -> [];
 'ibm-not-wf-P04-ibm04n10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12975,8 +12975,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n11'(suite) -> [];
 'ibm-not-wf-P04-ibm04n11'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n11.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n11.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -12988,8 +12988,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n12'(suite) -> [];
 'ibm-not-wf-P04-ibm04n12'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n12.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n12.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13001,8 +13001,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n13'(suite) -> [];
 'ibm-not-wf-P04-ibm04n13'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n13.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n13.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13014,8 +13014,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n14'(suite) -> [];
 'ibm-not-wf-P04-ibm04n14'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n14.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n14.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13027,8 +13027,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n15'(suite) -> [];
 'ibm-not-wf-P04-ibm04n15'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n15.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n15.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13040,8 +13040,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n16'(suite) -> [];
 'ibm-not-wf-P04-ibm04n16'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n16.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n16.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13053,8 +13053,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n17'(suite) -> [];
 'ibm-not-wf-P04-ibm04n17'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n17.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n17.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13066,8 +13066,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P04-ibm04n18'(suite) -> [];
 'ibm-not-wf-P04-ibm04n18'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P04/ibm04n18.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P04/ibm04n18.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13084,8 +13084,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P05-ibm05n01'(suite) -> [];
 'ibm-not-wf-P05-ibm05n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P05/ibm05n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P05/ibm05n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13097,8 +13097,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P05-ibm05n02'(suite) -> [];
 'ibm-not-wf-P05-ibm05n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P05/ibm05n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P05/ibm05n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13110,8 +13110,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P05-ibm05n03'(suite) -> [];
 'ibm-not-wf-P05-ibm05n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P05/ibm05n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P05/ibm05n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13128,8 +13128,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P09-ibm09n01'(suite) -> [];
 'ibm-not-wf-P09-ibm09n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P09/ibm09n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P09/ibm09n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13141,8 +13141,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P09-ibm09n02'(suite) -> [];
 'ibm-not-wf-P09-ibm09n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P09/ibm09n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P09/ibm09n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13154,8 +13154,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P09-ibm09n03'(suite) -> [];
 'ibm-not-wf-P09-ibm09n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P09/ibm09n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P09/ibm09n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13167,8 +13167,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P09-ibm09n04'(suite) -> [];
 'ibm-not-wf-P09-ibm09n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P09/ibm09n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P09/ibm09n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13185,8 +13185,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P10-ibm10n01'(suite) -> [];
 'ibm-not-wf-P10-ibm10n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P10/ibm10n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13198,8 +13198,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P10-ibm10n02'(suite) -> [];
 'ibm-not-wf-P10-ibm10n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P10/ibm10n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13211,8 +13211,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P10-ibm10n03'(suite) -> [];
 'ibm-not-wf-P10-ibm10n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P10/ibm10n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13224,8 +13224,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P10-ibm10n04'(suite) -> [];
 'ibm-not-wf-P10-ibm10n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P10/ibm10n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13237,8 +13237,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P10-ibm10n05'(suite) -> [];
 'ibm-not-wf-P10-ibm10n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P10/ibm10n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13250,8 +13250,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P10-ibm10n06'(suite) -> [];
 'ibm-not-wf-P10-ibm10n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P10/ibm10n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13263,8 +13263,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P10-ibm10n07'(suite) -> [];
 'ibm-not-wf-P10-ibm10n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P10/ibm10n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13276,8 +13276,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P10-ibm10n08'(suite) -> [];
 'ibm-not-wf-P10-ibm10n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P10/ibm10n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P10/ibm10n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13294,8 +13294,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P11-ibm11n01'(suite) -> [];
 'ibm-not-wf-P11-ibm11n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P11/ibm11n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P11/ibm11n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13307,8 +13307,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P11-ibm11n02'(suite) -> [];
 'ibm-not-wf-P11-ibm11n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P11/ibm11n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P11/ibm11n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13320,8 +13320,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P11-ibm11n03'(suite) -> [];
 'ibm-not-wf-P11-ibm11n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P11/ibm11n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P11/ibm11n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13333,8 +13333,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P11-ibm11n04'(suite) -> [];
 'ibm-not-wf-P11-ibm11n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P11/ibm11n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P11/ibm11n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13351,8 +13351,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P12-ibm12n01'(suite) -> [];
 'ibm-not-wf-P12-ibm12n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P12/ibm12n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P12/ibm12n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13364,8 +13364,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P12-ibm12n02'(suite) -> [];
 'ibm-not-wf-P12-ibm12n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P12/ibm12n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P12/ibm12n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13377,8 +13377,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P12-ibm12n03'(suite) -> [];
 'ibm-not-wf-P12-ibm12n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P12/ibm12n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P12/ibm12n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13395,8 +13395,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P13-ibm13n01'(suite) -> [];
 'ibm-not-wf-P13-ibm13n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P13/ibm13n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P13/ibm13n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13408,8 +13408,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P13-ibm13n02'(suite) -> [];
 'ibm-not-wf-P13-ibm13n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P13/ibm13n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P13/ibm13n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13421,8 +13421,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.3
 'ibm-not-wf-P13-ibm13n03'(suite) -> [];
 'ibm-not-wf-P13-ibm13n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P13/ibm13n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P13/ibm13n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13439,8 +13439,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.4
 'ibm-not-wf-P14-ibm14n01'(suite) -> [];
 'ibm-not-wf-P14-ibm14n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P14/ibm14n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P14/ibm14n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13452,8 +13452,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.4
 'ibm-not-wf-P14-ibm14n02'(suite) -> [];
 'ibm-not-wf-P14-ibm14n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P14/ibm14n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P14/ibm14n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13465,8 +13465,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.4
 'ibm-not-wf-P14-ibm14n03'(suite) -> [];
 'ibm-not-wf-P14-ibm14n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P14/ibm14n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P14/ibm14n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13483,8 +13483,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5
 'ibm-not-wf-P15-ibm15n01'(suite) -> [];
 'ibm-not-wf-P15-ibm15n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P15/ibm15n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P15/ibm15n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13496,8 +13496,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5
 'ibm-not-wf-P15-ibm15n02'(suite) -> [];
 'ibm-not-wf-P15-ibm15n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P15/ibm15n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P15/ibm15n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13509,8 +13509,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5
 'ibm-not-wf-P15-ibm15n03'(suite) -> [];
 'ibm-not-wf-P15-ibm15n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P15/ibm15n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P15/ibm15n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13522,8 +13522,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.5
 'ibm-not-wf-P15-ibm15n04'(suite) -> [];
 'ibm-not-wf-P15-ibm15n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P15/ibm15n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P15/ibm15n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13540,8 +13540,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6
 'ibm-not-wf-P16-ibm16n01'(suite) -> [];
 'ibm-not-wf-P16-ibm16n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P16/ibm16n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P16/ibm16n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13553,8 +13553,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6
 'ibm-not-wf-P16-ibm16n02'(suite) -> [];
 'ibm-not-wf-P16-ibm16n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P16/ibm16n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P16/ibm16n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13566,8 +13566,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6
 'ibm-not-wf-P16-ibm16n03'(suite) -> [];
 'ibm-not-wf-P16-ibm16n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P16/ibm16n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P16/ibm16n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13579,8 +13579,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6
 'ibm-not-wf-P16-ibm16n04'(suite) -> [];
 'ibm-not-wf-P16-ibm16n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P16/ibm16n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P16/ibm16n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13597,8 +13597,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6
 'ibm-not-wf-P17-ibm17n01'(suite) -> [];
 'ibm-not-wf-P17-ibm17n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P17/ibm17n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P17/ibm17n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13610,8 +13610,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6
 'ibm-not-wf-P17-ibm17n02'(suite) -> [];
 'ibm-not-wf-P17-ibm17n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P17/ibm17n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P17/ibm17n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13623,8 +13623,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6
 'ibm-not-wf-P17-ibm17n03'(suite) -> [];
 'ibm-not-wf-P17-ibm17n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P17/ibm17n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P17/ibm17n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13636,8 +13636,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.6
 'ibm-not-wf-P17-ibm17n04'(suite) -> [];
 'ibm-not-wf-P17-ibm17n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P17/ibm17n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P17/ibm17n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13654,8 +13654,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7
 'ibm-not-wf-P18-ibm18n01'(suite) -> [];
 'ibm-not-wf-P18-ibm18n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P18/ibm18n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P18/ibm18n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13667,8 +13667,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7
 'ibm-not-wf-P18-ibm18n02'(suite) -> [];
 'ibm-not-wf-P18-ibm18n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P18/ibm18n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P18/ibm18n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13685,8 +13685,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7
 'ibm-not-wf-P19-ibm19n01'(suite) -> [];
 'ibm-not-wf-P19-ibm19n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P19/ibm19n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P19/ibm19n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13698,8 +13698,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7
 'ibm-not-wf-P19-ibm19n02'(suite) -> [];
 'ibm-not-wf-P19-ibm19n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P19/ibm19n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P19/ibm19n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13711,8 +13711,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7
 'ibm-not-wf-P19-ibm19n03'(suite) -> [];
 'ibm-not-wf-P19-ibm19n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P19/ibm19n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P19/ibm19n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13729,8 +13729,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7
 'ibm-not-wf-P20-ibm20n01'(suite) -> [];
 'ibm-not-wf-P20-ibm20n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P20/ibm20n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P20/ibm20n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13747,8 +13747,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7
 'ibm-not-wf-P21-ibm21n01'(suite) -> [];
 'ibm-not-wf-P21-ibm21n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P21/ibm21n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P21/ibm21n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13760,8 +13760,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7
 'ibm-not-wf-P21-ibm21n02'(suite) -> [];
 'ibm-not-wf-P21-ibm21n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P21/ibm21n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P21/ibm21n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13773,8 +13773,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.7
 'ibm-not-wf-P21-ibm21n03'(suite) -> [];
 'ibm-not-wf-P21-ibm21n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P21/ibm21n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P21/ibm21n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13791,8 +13791,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P22-ibm22n01'(suite) -> [];
 'ibm-not-wf-P22-ibm22n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P22/ibm22n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P22/ibm22n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13804,8 +13804,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P22-ibm22n02'(suite) -> [];
 'ibm-not-wf-P22-ibm22n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P22/ibm22n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P22/ibm22n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13817,8 +13817,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P22-ibm22n03'(suite) -> [];
 'ibm-not-wf-P22-ibm22n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P22/ibm22n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P22/ibm22n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13835,8 +13835,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P23-ibm23n01'(suite) -> [];
 'ibm-not-wf-P23-ibm23n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P23/ibm23n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P23/ibm23n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13848,8 +13848,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P23-ibm23n02'(suite) -> [];
 'ibm-not-wf-P23-ibm23n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P23/ibm23n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P23/ibm23n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13861,8 +13861,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P23-ibm23n03'(suite) -> [];
 'ibm-not-wf-P23-ibm23n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P23/ibm23n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P23/ibm23n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13874,8 +13874,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P23-ibm23n04'(suite) -> [];
 'ibm-not-wf-P23-ibm23n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P23/ibm23n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P23/ibm23n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13887,8 +13887,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P23-ibm23n05'(suite) -> [];
 'ibm-not-wf-P23-ibm23n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P23/ibm23n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P23/ibm23n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13900,8 +13900,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P23-ibm23n06'(suite) -> [];
 'ibm-not-wf-P23-ibm23n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P23/ibm23n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P23/ibm23n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13918,8 +13918,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P24-ibm24n01'(suite) -> [];
 'ibm-not-wf-P24-ibm24n01'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P24/ibm24n01.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n01.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -13931,8 +13931,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P24-ibm24n02'(suite) -> [];
 'ibm-not-wf-P24-ibm24n02'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P24/ibm24n02.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n02.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -13944,8 +13944,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P24-ibm24n03'(suite) -> [];
 'ibm-not-wf-P24-ibm24n03'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P24/ibm24n03.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n03.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -13957,8 +13957,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P24-ibm24n04'(suite) -> [];
 'ibm-not-wf-P24-ibm24n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P24/ibm24n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13970,8 +13970,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P24-ibm24n05'(suite) -> [];
 'ibm-not-wf-P24-ibm24n05'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P24/ibm24n05.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n05.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -13983,8 +13983,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P24-ibm24n06'(suite) -> [];
 'ibm-not-wf-P24-ibm24n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P24/ibm24n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -13996,8 +13996,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P24-ibm24n07'(suite) -> [];
 'ibm-not-wf-P24-ibm24n07'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P24/ibm24n07.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n07.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -14009,8 +14009,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P24-ibm24n08'(suite) -> [];
 'ibm-not-wf-P24-ibm24n08'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P24/ibm24n08.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n08.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -14022,8 +14022,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P24-ibm24n09'(suite) -> [];
 'ibm-not-wf-P24-ibm24n09'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P24/ibm24n09.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P24/ibm24n09.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -14040,8 +14040,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P25-ibm25n01'(suite) -> [];
 'ibm-not-wf-P25-ibm25n01'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P25/ibm25n01.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P25/ibm25n01.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -14053,8 +14053,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P25-ibm25n02'(suite) -> [];
 'ibm-not-wf-P25-ibm25n02'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P25/ibm25n02.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P25/ibm25n02.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -14071,8 +14071,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P26-ibm26n01'(suite) -> [];
 'ibm-not-wf-P26-ibm26n01'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P26/ibm26n01.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P26/ibm26n01.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -14089,8 +14089,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P27-ibm27n01'(suite) -> [];
 'ibm-not-wf-P27-ibm27n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P27/ibm27n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P27/ibm27n01.xml"]),
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
@@ -14110,8 +14110,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P28-ibm28n01'(suite) -> [];
 'ibm-not-wf-P28-ibm28n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P28/ibm28n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14123,8 +14123,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P28-ibm28n02'(suite) -> [];
 'ibm-not-wf-P28-ibm28n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P28/ibm28n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14136,8 +14136,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P28-ibm28n03'(suite) -> [];
 'ibm-not-wf-P28-ibm28n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P28/ibm28n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14149,8 +14149,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P28-ibm28n04'(suite) -> [];
 'ibm-not-wf-P28-ibm28n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P28/ibm28n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14162,8 +14162,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P28-ibm28n05'(suite) -> [];
 'ibm-not-wf-P28-ibm28n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P28/ibm28n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14175,8 +14175,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P28-ibm28n06'(suite) -> [];
 'ibm-not-wf-P28-ibm28n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P28/ibm28n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14188,8 +14188,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P28-ibm28n07'(suite) -> [];
 'ibm-not-wf-P28-ibm28n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P28/ibm28n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14201,8 +14201,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P28-ibm28n08'(suite) -> [];
 'ibm-not-wf-P28-ibm28n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P28/ibm28n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P28/ibm28n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14219,8 +14219,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-p28a-ibm28an01'(suite) -> [];
 'ibm-not-wf-p28a-ibm28an01'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/p28a/ibm28an01.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/p28a/ibm28an01.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -14237,8 +14237,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P29-ibm29n01'(suite) -> [];
 'ibm-not-wf-P29-ibm29n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P29/ibm29n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P29/ibm29n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14250,8 +14250,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P29-ibm29n02'(suite) -> [];
 'ibm-not-wf-P29-ibm29n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P29/ibm29n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P29/ibm29n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14263,8 +14263,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P29-ibm29n03'(suite) -> [];
 'ibm-not-wf-P29-ibm29n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P29/ibm29n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P29/ibm29n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14276,8 +14276,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P29-ibm29n04'(suite) -> [];
 'ibm-not-wf-P29-ibm29n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P29/ibm29n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P29/ibm29n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14289,8 +14289,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P29-ibm29n05'(suite) -> [];
 'ibm-not-wf-P29-ibm29n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P29/ibm29n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P29/ibm29n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14302,8 +14302,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P29-ibm29n06'(suite) -> [];
 'ibm-not-wf-P29-ibm29n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P29/ibm29n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P29/ibm29n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14315,8 +14315,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P29-ibm29n07'(suite) -> [];
 'ibm-not-wf-P29-ibm29n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P29/ibm29n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P29/ibm29n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14333,8 +14333,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P30-ibm30n01'(suite) -> [];
 'ibm-not-wf-P30-ibm30n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P30/ibm30n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P30/ibm30n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14351,8 +14351,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.8
 'ibm-not-wf-P31-ibm31n01'(suite) -> [];
 'ibm-not-wf-P31-ibm31n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P31/ibm31n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P31/ibm31n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14369,8 +14369,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'ibm-not-wf-P32-ibm32n01'(suite) -> [];
 'ibm-not-wf-P32-ibm32n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P32/ibm32n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14382,8 +14382,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'ibm-not-wf-P32-ibm32n02'(suite) -> [];
 'ibm-not-wf-P32-ibm32n02'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P32/ibm32n02.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n02.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -14395,8 +14395,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'ibm-not-wf-P32-ibm32n03'(suite) -> [];
 'ibm-not-wf-P32-ibm32n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P32/ibm32n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14408,8 +14408,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'ibm-not-wf-P32-ibm32n04'(suite) -> [];
 'ibm-not-wf-P32-ibm32n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P32/ibm32n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14421,8 +14421,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'ibm-not-wf-P32-ibm32n05'(suite) -> [];
 'ibm-not-wf-P32-ibm32n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P32/ibm32n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14434,8 +14434,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'ibm-not-wf-P32-ibm32n06'(suite) -> [];
 'ibm-not-wf-P32-ibm32n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P32/ibm32n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14447,8 +14447,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'ibm-not-wf-P32-ibm32n07'(suite) -> [];
 'ibm-not-wf-P32-ibm32n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P32/ibm32n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14460,8 +14460,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'ibm-not-wf-P32-ibm32n08'(suite) -> [];
 'ibm-not-wf-P32-ibm32n08'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P32/ibm32n08.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n08.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -14473,8 +14473,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 2.9
 'ibm-not-wf-P32-ibm32n09'(suite) -> [];
 'ibm-not-wf-P32-ibm32n09'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P32/ibm32n09.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P32/ibm32n09.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -14491,8 +14491,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'ibm-not-wf-P39-ibm39n01'(suite) -> [];
 'ibm-not-wf-P39-ibm39n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P39/ibm39n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P39/ibm39n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14504,8 +14504,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'ibm-not-wf-P39-ibm39n02'(suite) -> [];
 'ibm-not-wf-P39-ibm39n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P39/ibm39n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P39/ibm39n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14517,8 +14517,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'ibm-not-wf-P39-ibm39n03'(suite) -> [];
 'ibm-not-wf-P39-ibm39n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P39/ibm39n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P39/ibm39n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14530,8 +14530,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'ibm-not-wf-P39-ibm39n04'(suite) -> [];
 'ibm-not-wf-P39-ibm39n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P39/ibm39n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P39/ibm39n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14543,8 +14543,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'ibm-not-wf-P39-ibm39n05'(suite) -> [];
 'ibm-not-wf-P39-ibm39n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P39/ibm39n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P39/ibm39n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14556,8 +14556,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3
 'ibm-not-wf-P39-ibm39n06'(suite) -> [];
 'ibm-not-wf-P39-ibm39n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P39/ibm39n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P39/ibm39n06.xml"]),
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
@@ -14577,8 +14577,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P40-ibm40n01'(suite) -> [];
 'ibm-not-wf-P40-ibm40n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P40/ibm40n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P40/ibm40n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14590,8 +14590,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P40-ibm40n02'(suite) -> [];
 'ibm-not-wf-P40-ibm40n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P40/ibm40n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P40/ibm40n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14603,8 +14603,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P40-ibm40n03'(suite) -> [];
 'ibm-not-wf-P40-ibm40n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P40/ibm40n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P40/ibm40n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14616,8 +14616,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P40-ibm40n04'(suite) -> [];
 'ibm-not-wf-P40-ibm40n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P40/ibm40n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P40/ibm40n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14629,8 +14629,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P40-ibm40n05'(suite) -> [];
 'ibm-not-wf-P40-ibm40n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P40/ibm40n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P40/ibm40n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14647,8 +14647,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P41-ibm41n01'(suite) -> [];
 'ibm-not-wf-P41-ibm41n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P41/ibm41n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14660,8 +14660,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P41-ibm41n02'(suite) -> [];
 'ibm-not-wf-P41-ibm41n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P41/ibm41n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14673,8 +14673,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P41-ibm41n03'(suite) -> [];
 'ibm-not-wf-P41-ibm41n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P41/ibm41n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14686,8 +14686,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P41-ibm41n04'(suite) -> [];
 'ibm-not-wf-P41-ibm41n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P41/ibm41n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14699,8 +14699,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P41-ibm41n05'(suite) -> [];
 'ibm-not-wf-P41-ibm41n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P41/ibm41n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14712,8 +14712,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P41-ibm41n06'(suite) -> [];
 'ibm-not-wf-P41-ibm41n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P41/ibm41n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14725,8 +14725,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P41-ibm41n07'(suite) -> [];
 'ibm-not-wf-P41-ibm41n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P41/ibm41n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14738,8 +14738,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P41-ibm41n08'(suite) -> [];
 'ibm-not-wf-P41-ibm41n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P41/ibm41n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14751,8 +14751,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P41-ibm41n09'(suite) -> [];
 'ibm-not-wf-P41-ibm41n09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P41/ibm41n09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14764,8 +14764,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P41-ibm41n10'(suite) -> [];
 'ibm-not-wf-P41-ibm41n10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P41/ibm41n10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14777,8 +14777,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P41-ibm41n11'(suite) -> [];
 'ibm-not-wf-P41-ibm41n11'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P41/ibm41n11.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n11.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14790,8 +14790,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P41-ibm41n12'(suite) -> [];
 'ibm-not-wf-P41-ibm41n12'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P41/ibm41n12.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n12.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14803,8 +14803,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P41-ibm41n13'(suite) -> [];
 'ibm-not-wf-P41-ibm41n13'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P41/ibm41n13.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n13.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14816,8 +14816,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P41-ibm41n14'(suite) -> [];
 'ibm-not-wf-P41-ibm41n14'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P41/ibm41n14.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P41/ibm41n14.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14834,8 +14834,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P42-ibm42n01'(suite) -> [];
 'ibm-not-wf-P42-ibm42n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P42/ibm42n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P42/ibm42n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14847,8 +14847,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P42-ibm42n02'(suite) -> [];
 'ibm-not-wf-P42-ibm42n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P42/ibm42n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P42/ibm42n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14860,8 +14860,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P42-ibm42n03'(suite) -> [];
 'ibm-not-wf-P42-ibm42n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P42/ibm42n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P42/ibm42n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14873,8 +14873,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P42-ibm42n04'(suite) -> [];
 'ibm-not-wf-P42-ibm42n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P42/ibm42n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P42/ibm42n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14886,8 +14886,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P42-ibm42n05'(suite) -> [];
 'ibm-not-wf-P42-ibm42n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P42/ibm42n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P42/ibm42n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14904,8 +14904,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P43-ibm43n01'(suite) -> [];
 'ibm-not-wf-P43-ibm43n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P43/ibm43n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P43/ibm43n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14917,8 +14917,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P43-ibm43n02'(suite) -> [];
 'ibm-not-wf-P43-ibm43n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P43/ibm43n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P43/ibm43n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14930,8 +14930,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P43-ibm43n04'(suite) -> [];
 'ibm-not-wf-P43-ibm43n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P43/ibm43n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P43/ibm43n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14943,8 +14943,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P43-ibm43n05'(suite) -> [];
 'ibm-not-wf-P43-ibm43n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P43/ibm43n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P43/ibm43n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14961,8 +14961,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P44-ibm44n01'(suite) -> [];
 'ibm-not-wf-P44-ibm44n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P44/ibm44n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P44/ibm44n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14974,8 +14974,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P44-ibm44n02'(suite) -> [];
 'ibm-not-wf-P44-ibm44n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P44/ibm44n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P44/ibm44n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -14987,8 +14987,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P44-ibm44n03'(suite) -> [];
 'ibm-not-wf-P44-ibm44n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P44/ibm44n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P44/ibm44n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15000,8 +15000,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.1
 'ibm-not-wf-P44-ibm44n04'(suite) -> [];
 'ibm-not-wf-P44-ibm44n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P44/ibm44n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P44/ibm44n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15018,8 +15018,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'ibm-not-wf-P45-ibm45n01'(suite) -> [];
 'ibm-not-wf-P45-ibm45n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P45/ibm45n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15031,8 +15031,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'ibm-not-wf-P45-ibm45n02'(suite) -> [];
 'ibm-not-wf-P45-ibm45n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P45/ibm45n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15044,8 +15044,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'ibm-not-wf-P45-ibm45n03'(suite) -> [];
 'ibm-not-wf-P45-ibm45n03'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P45/ibm45n03.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n03.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15057,8 +15057,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'ibm-not-wf-P45-ibm45n04'(suite) -> [];
 'ibm-not-wf-P45-ibm45n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P45/ibm45n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15070,8 +15070,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'ibm-not-wf-P45-ibm45n05'(suite) -> [];
 'ibm-not-wf-P45-ibm45n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P45/ibm45n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15083,8 +15083,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'ibm-not-wf-P45-ibm45n06'(suite) -> [];
 'ibm-not-wf-P45-ibm45n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P45/ibm45n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15096,8 +15096,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'ibm-not-wf-P45-ibm45n07'(suite) -> [];
 'ibm-not-wf-P45-ibm45n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P45/ibm45n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15109,8 +15109,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'ibm-not-wf-P45-ibm45n08'(suite) -> [];
 'ibm-not-wf-P45-ibm45n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P45/ibm45n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15122,8 +15122,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'ibm-not-wf-P45-ibm45n09'(suite) -> [];
 'ibm-not-wf-P45-ibm45n09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P45/ibm45n09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P45/ibm45n09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15140,8 +15140,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'ibm-not-wf-P46-ibm46n01'(suite) -> [];
 'ibm-not-wf-P46-ibm46n01'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P46/ibm46n01.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P46/ibm46n01.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15153,8 +15153,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'ibm-not-wf-P46-ibm46n02'(suite) -> [];
 'ibm-not-wf-P46-ibm46n02'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P46/ibm46n02.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P46/ibm46n02.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15166,8 +15166,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'ibm-not-wf-P46-ibm46n03'(suite) -> [];
 'ibm-not-wf-P46-ibm46n03'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P46/ibm46n03.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P46/ibm46n03.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15179,8 +15179,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'ibm-not-wf-P46-ibm46n04'(suite) -> [];
 'ibm-not-wf-P46-ibm46n04'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P46/ibm46n04.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P46/ibm46n04.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15192,8 +15192,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2
 'ibm-not-wf-P46-ibm46n05'(suite) -> [];
 'ibm-not-wf-P46-ibm46n05'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P46/ibm46n05.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P46/ibm46n05.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15210,8 +15210,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P47-ibm47n01'(suite) -> [];
 'ibm-not-wf-P47-ibm47n01'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P47/ibm47n01.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P47/ibm47n01.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15223,8 +15223,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P47-ibm47n02'(suite) -> [];
 'ibm-not-wf-P47-ibm47n02'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P47/ibm47n02.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P47/ibm47n02.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15236,8 +15236,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P47-ibm47n03'(suite) -> [];
 'ibm-not-wf-P47-ibm47n03'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P47/ibm47n03.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P47/ibm47n03.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15249,8 +15249,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P47-ibm47n04'(suite) -> [];
 'ibm-not-wf-P47-ibm47n04'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P47/ibm47n04.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P47/ibm47n04.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15262,8 +15262,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P47-ibm47n05'(suite) -> [];
 'ibm-not-wf-P47-ibm47n05'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P47/ibm47n05.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P47/ibm47n05.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15275,8 +15275,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P47-ibm47n06'(suite) -> [];
 'ibm-not-wf-P47-ibm47n06'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P47/ibm47n06.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P47/ibm47n06.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15293,8 +15293,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P48-ibm48n01'(suite) -> [];
 'ibm-not-wf-P48-ibm48n01'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P48/ibm48n01.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P48/ibm48n01.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15306,8 +15306,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P48-ibm48n02'(suite) -> [];
 'ibm-not-wf-P48-ibm48n02'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P48/ibm48n02.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P48/ibm48n02.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15319,8 +15319,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P48-ibm48n03'(suite) -> [];
 'ibm-not-wf-P48-ibm48n03'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P48/ibm48n03.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P48/ibm48n03.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15332,8 +15332,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P48-ibm48n04'(suite) -> [];
 'ibm-not-wf-P48-ibm48n04'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P48/ibm48n04.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P48/ibm48n04.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15345,8 +15345,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P48-ibm48n05'(suite) -> [];
 'ibm-not-wf-P48-ibm48n05'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P48/ibm48n05.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P48/ibm48n05.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15358,8 +15358,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P48-ibm48n06'(suite) -> [];
 'ibm-not-wf-P48-ibm48n06'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P48/ibm48n06.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P48/ibm48n06.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15371,8 +15371,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P48-ibm48n07'(suite) -> [];
 'ibm-not-wf-P48-ibm48n07'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P48/ibm48n07.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P48/ibm48n07.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15389,8 +15389,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P49-ibm49n01'(suite) -> [];
 'ibm-not-wf-P49-ibm49n01'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P49/ibm49n01.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P49/ibm49n01.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15402,8 +15402,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P49-ibm49n02'(suite) -> [];
 'ibm-not-wf-P49-ibm49n02'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P49/ibm49n02.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P49/ibm49n02.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15415,8 +15415,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P49-ibm49n03'(suite) -> [];
 'ibm-not-wf-P49-ibm49n03'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P49/ibm49n03.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P49/ibm49n03.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15428,8 +15428,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P49-ibm49n04'(suite) -> [];
 'ibm-not-wf-P49-ibm49n04'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P49/ibm49n04.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P49/ibm49n04.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15441,8 +15441,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P49-ibm49n05'(suite) -> [];
 'ibm-not-wf-P49-ibm49n05'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P49/ibm49n05.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P49/ibm49n05.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15454,8 +15454,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P49-ibm49n06'(suite) -> [];
 'ibm-not-wf-P49-ibm49n06'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P49/ibm49n06.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P49/ibm49n06.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -15472,8 +15472,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P50-ibm50n01'(suite) -> [];
 'ibm-not-wf-P50-ibm50n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P50/ibm50n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P50/ibm50n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15485,8 +15485,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P50-ibm50n02'(suite) -> [];
 'ibm-not-wf-P50-ibm50n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P50/ibm50n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P50/ibm50n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15498,8 +15498,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P50-ibm50n03'(suite) -> [];
 'ibm-not-wf-P50-ibm50n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P50/ibm50n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P50/ibm50n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15511,8 +15511,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P50-ibm50n04'(suite) -> [];
 'ibm-not-wf-P50-ibm50n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P50/ibm50n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P50/ibm50n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15524,8 +15524,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P50-ibm50n05'(suite) -> [];
 'ibm-not-wf-P50-ibm50n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P50/ibm50n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P50/ibm50n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15537,8 +15537,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P50-ibm50n06'(suite) -> [];
 'ibm-not-wf-P50-ibm50n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P50/ibm50n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P50/ibm50n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15550,8 +15550,8 @@ end_per_testcase(_Func,_Config) ->
 %% Sections: 3.2.1
 'ibm-not-wf-P50-ibm50n07'(suite) -> [];
 'ibm-not-wf-P50-ibm50n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P50/ibm50n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P50/ibm50n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15570,8 +15570,8 @@ testcases67(suite) -> [].
 %% Sections: 3.2.2
 'ibm-not-wf-P51-ibm51n01'(suite) -> [];
 'ibm-not-wf-P51-ibm51n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P51/ibm51n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P51/ibm51n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15583,8 +15583,8 @@ testcases67(suite) -> [].
 %% Sections: 3.2.2
 'ibm-not-wf-P51-ibm51n02'(suite) -> [];
 'ibm-not-wf-P51-ibm51n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P51/ibm51n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P51/ibm51n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15596,8 +15596,8 @@ testcases67(suite) -> [].
 %% Sections: 3.2.2
 'ibm-not-wf-P51-ibm51n03'(suite) -> [];
 'ibm-not-wf-P51-ibm51n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P51/ibm51n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P51/ibm51n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15609,8 +15609,8 @@ testcases67(suite) -> [].
 %% Sections: 3.2.2
 'ibm-not-wf-P51-ibm51n04'(suite) -> [];
 'ibm-not-wf-P51-ibm51n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P51/ibm51n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P51/ibm51n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15622,8 +15622,8 @@ testcases67(suite) -> [].
 %% Sections: 3.2.2
 'ibm-not-wf-P51-ibm51n05'(suite) -> [];
 'ibm-not-wf-P51-ibm51n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P51/ibm51n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P51/ibm51n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15635,8 +15635,8 @@ testcases67(suite) -> [].
 %% Sections: 3.2.2
 'ibm-not-wf-P51-ibm51n06'(suite) -> [];
 'ibm-not-wf-P51-ibm51n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P51/ibm51n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P51/ibm51n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15648,8 +15648,8 @@ testcases67(suite) -> [].
 %% Sections: 3.2.2
 'ibm-not-wf-P51-ibm51n07'(suite) -> [];
 'ibm-not-wf-P51-ibm51n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P51/ibm51n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P51/ibm51n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15668,8 +15668,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3
 'ibm-not-wf-P52-ibm52n01'(suite) -> [];
 'ibm-not-wf-P52-ibm52n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P52/ibm52n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P52/ibm52n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15681,8 +15681,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3
 'ibm-not-wf-P52-ibm52n02'(suite) -> [];
 'ibm-not-wf-P52-ibm52n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P52/ibm52n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P52/ibm52n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15694,8 +15694,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3
 'ibm-not-wf-P52-ibm52n03'(suite) -> [];
 'ibm-not-wf-P52-ibm52n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P52/ibm52n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P52/ibm52n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15707,8 +15707,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3
 'ibm-not-wf-P52-ibm52n04'(suite) -> [];
 'ibm-not-wf-P52-ibm52n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P52/ibm52n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P52/ibm52n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15720,8 +15720,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3
 'ibm-not-wf-P52-ibm52n05'(suite) -> [];
 'ibm-not-wf-P52-ibm52n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P52/ibm52n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P52/ibm52n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15733,8 +15733,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3
 'ibm-not-wf-P52-ibm52n06'(suite) -> [];
 'ibm-not-wf-P52-ibm52n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P52/ibm52n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P52/ibm52n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15751,8 +15751,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3
 'ibm-not-wf-P53-ibm53n01'(suite) -> [];
 'ibm-not-wf-P53-ibm53n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P53/ibm53n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15764,8 +15764,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3
 'ibm-not-wf-P53-ibm53n02'(suite) -> [];
 'ibm-not-wf-P53-ibm53n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P53/ibm53n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15777,8 +15777,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3
 'ibm-not-wf-P53-ibm53n03'(suite) -> [];
 'ibm-not-wf-P53-ibm53n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P53/ibm53n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15790,8 +15790,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3
 'ibm-not-wf-P53-ibm53n04'(suite) -> [];
 'ibm-not-wf-P53-ibm53n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P53/ibm53n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15803,8 +15803,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3
 'ibm-not-wf-P53-ibm53n05'(suite) -> [];
 'ibm-not-wf-P53-ibm53n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P53/ibm53n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15816,8 +15816,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3
 'ibm-not-wf-P53-ibm53n06'(suite) -> [];
 'ibm-not-wf-P53-ibm53n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P53/ibm53n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15829,8 +15829,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3
 'ibm-not-wf-P53-ibm53n07'(suite) -> [];
 'ibm-not-wf-P53-ibm53n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P53/ibm53n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15842,8 +15842,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3
 'ibm-not-wf-P53-ibm53n08'(suite) -> [];
 'ibm-not-wf-P53-ibm53n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P53/ibm53n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P53/ibm53n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15860,8 +15860,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P54-ibm54n01'(suite) -> [];
 'ibm-not-wf-P54-ibm54n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P54/ibm54n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P54/ibm54n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15873,8 +15873,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P54-ibm54n02'(suite) -> [];
 'ibm-not-wf-P54-ibm54n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P54/ibm54n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P54/ibm54n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15891,8 +15891,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P55-ibm55n01'(suite) -> [];
 'ibm-not-wf-P55-ibm55n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P55/ibm55n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P55/ibm55n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15904,8 +15904,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P55-ibm55n02'(suite) -> [];
 'ibm-not-wf-P55-ibm55n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P55/ibm55n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P55/ibm55n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15917,8 +15917,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P55-ibm55n03'(suite) -> [];
 'ibm-not-wf-P55-ibm55n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P55/ibm55n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P55/ibm55n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15935,8 +15935,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P56-ibm56n01'(suite) -> [];
 'ibm-not-wf-P56-ibm56n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P56/ibm56n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P56/ibm56n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15948,8 +15948,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P56-ibm56n02'(suite) -> [];
 'ibm-not-wf-P56-ibm56n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P56/ibm56n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P56/ibm56n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15961,8 +15961,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P56-ibm56n03'(suite) -> [];
 'ibm-not-wf-P56-ibm56n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P56/ibm56n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P56/ibm56n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15974,8 +15974,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P56-ibm56n04'(suite) -> [];
 'ibm-not-wf-P56-ibm56n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P56/ibm56n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P56/ibm56n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -15987,8 +15987,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P56-ibm56n05'(suite) -> [];
 'ibm-not-wf-P56-ibm56n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P56/ibm56n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P56/ibm56n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16000,8 +16000,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P56-ibm56n06'(suite) -> [];
 'ibm-not-wf-P56-ibm56n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P56/ibm56n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P56/ibm56n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16013,8 +16013,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P56-ibm56n07'(suite) -> [];
 'ibm-not-wf-P56-ibm56n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P56/ibm56n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P56/ibm56n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16031,8 +16031,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P57-ibm57n01'(suite) -> [];
 'ibm-not-wf-P57-ibm57n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P57/ibm57n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P57/ibm57n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16049,8 +16049,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P58-ibm58n01'(suite) -> [];
 'ibm-not-wf-P58-ibm58n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P58/ibm58n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16062,8 +16062,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P58-ibm58n02'(suite) -> [];
 'ibm-not-wf-P58-ibm58n02'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P58/ibm58n02.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n02.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -16075,8 +16075,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P58-ibm58n03'(suite) -> [];
 'ibm-not-wf-P58-ibm58n03'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P58/ibm58n03.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n03.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -16088,8 +16088,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P58-ibm58n04'(suite) -> [];
 'ibm-not-wf-P58-ibm58n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P58/ibm58n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16101,8 +16101,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P58-ibm58n05'(suite) -> [];
 'ibm-not-wf-P58-ibm58n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P58/ibm58n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16114,8 +16114,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P58-ibm58n06'(suite) -> [];
 'ibm-not-wf-P58-ibm58n06'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P58/ibm58n06.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n06.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -16127,8 +16127,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P58-ibm58n07'(suite) -> [];
 'ibm-not-wf-P58-ibm58n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P58/ibm58n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16140,8 +16140,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P58-ibm58n08'(suite) -> [];
 'ibm-not-wf-P58-ibm58n08'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P58/ibm58n08.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P58/ibm58n08.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -16158,8 +16158,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P59-ibm59n01'(suite) -> [];
 'ibm-not-wf-P59-ibm59n01'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P59/ibm59n01.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P59/ibm59n01.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -16171,8 +16171,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P59-ibm59n02'(suite) -> [];
 'ibm-not-wf-P59-ibm59n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P59/ibm59n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P59/ibm59n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16184,8 +16184,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P59-ibm59n03'(suite) -> [];
 'ibm-not-wf-P59-ibm59n03'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P59/ibm59n03.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P59/ibm59n03.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -16197,8 +16197,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P59-ibm59n04'(suite) -> [];
 'ibm-not-wf-P59-ibm59n04'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P59/ibm59n04.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P59/ibm59n04.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -16210,8 +16210,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P59-ibm59n05'(suite) -> [];
 'ibm-not-wf-P59-ibm59n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P59/ibm59n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P59/ibm59n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16223,8 +16223,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.1
 'ibm-not-wf-P59-ibm59n06'(suite) -> [];
 'ibm-not-wf-P59-ibm59n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P59/ibm59n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P59/ibm59n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16241,8 +16241,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.2
 'ibm-not-wf-P60-ibm60n01'(suite) -> [];
 'ibm-not-wf-P60-ibm60n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P60/ibm60n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16254,8 +16254,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.2
 'ibm-not-wf-P60-ibm60n02'(suite) -> [];
 'ibm-not-wf-P60-ibm60n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P60/ibm60n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16267,8 +16267,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.2
 'ibm-not-wf-P60-ibm60n03'(suite) -> [];
 'ibm-not-wf-P60-ibm60n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P60/ibm60n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16280,8 +16280,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.2
 'ibm-not-wf-P60-ibm60n04'(suite) -> [];
 'ibm-not-wf-P60-ibm60n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P60/ibm60n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16293,8 +16293,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.2
 'ibm-not-wf-P60-ibm60n05'(suite) -> [];
 'ibm-not-wf-P60-ibm60n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P60/ibm60n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16306,8 +16306,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.2
 'ibm-not-wf-P60-ibm60n06'(suite) -> [];
 'ibm-not-wf-P60-ibm60n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P60/ibm60n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16319,8 +16319,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.2
 'ibm-not-wf-P60-ibm60n07'(suite) -> [];
 'ibm-not-wf-P60-ibm60n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P60/ibm60n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16332,8 +16332,8 @@ testcases68(suite) -> [].
 %% Sections: 3.3.2
 'ibm-not-wf-P60-ibm60n08'(suite) -> [];
 'ibm-not-wf-P60-ibm60n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P60/ibm60n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P60/ibm60n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16350,8 +16350,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P61-ibm61n01'(suite) -> [];
 'ibm-not-wf-P61-ibm61n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P61/ibm61n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P61/ibm61n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16368,8 +16368,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P62-ibm62n01'(suite) -> [];
 'ibm-not-wf-P62-ibm62n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P62/ibm62n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16381,8 +16381,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P62-ibm62n02'(suite) -> [];
 'ibm-not-wf-P62-ibm62n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P62/ibm62n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16394,8 +16394,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P62-ibm62n03'(suite) -> [];
 'ibm-not-wf-P62-ibm62n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P62/ibm62n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16407,8 +16407,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P62-ibm62n04'(suite) -> [];
 'ibm-not-wf-P62-ibm62n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P62/ibm62n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16420,8 +16420,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P62-ibm62n05'(suite) -> [];
 'ibm-not-wf-P62-ibm62n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P62/ibm62n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16433,8 +16433,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P62-ibm62n06'(suite) -> [];
 'ibm-not-wf-P62-ibm62n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P62/ibm62n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16446,8 +16446,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P62-ibm62n07'(suite) -> [];
 'ibm-not-wf-P62-ibm62n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P62/ibm62n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16459,8 +16459,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P62-ibm62n08'(suite) -> [];
 'ibm-not-wf-P62-ibm62n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P62/ibm62n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P62/ibm62n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16477,8 +16477,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P63-ibm63n01'(suite) -> [];
 'ibm-not-wf-P63-ibm63n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P63/ibm63n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P63/ibm63n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16490,8 +16490,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P63-ibm63n02'(suite) -> [];
 'ibm-not-wf-P63-ibm63n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P63/ibm63n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P63/ibm63n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16503,8 +16503,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P63-ibm63n03'(suite) -> [];
 'ibm-not-wf-P63-ibm63n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P63/ibm63n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P63/ibm63n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16516,8 +16516,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P63-ibm63n04'(suite) -> [];
 'ibm-not-wf-P63-ibm63n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P63/ibm63n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P63/ibm63n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16529,8 +16529,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P63-ibm63n05'(suite) -> [];
 'ibm-not-wf-P63-ibm63n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P63/ibm63n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P63/ibm63n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16542,8 +16542,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P63-ibm63n06'(suite) -> [];
 'ibm-not-wf-P63-ibm63n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P63/ibm63n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P63/ibm63n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16555,8 +16555,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P63-ibm63n07'(suite) -> [];
 'ibm-not-wf-P63-ibm63n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P63/ibm63n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P63/ibm63n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16573,8 +16573,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P64-ibm64n01'(suite) -> [];
 'ibm-not-wf-P64-ibm64n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P64/ibm64n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P64/ibm64n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16586,8 +16586,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P64-ibm64n02'(suite) -> [];
 'ibm-not-wf-P64-ibm64n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P64/ibm64n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P64/ibm64n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16599,8 +16599,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P64-ibm64n03'(suite) -> [];
 'ibm-not-wf-P64-ibm64n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P64/ibm64n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P64/ibm64n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16617,8 +16617,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P65-ibm65n01'(suite) -> [];
 'ibm-not-wf-P65-ibm65n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P65/ibm65n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P65/ibm65n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16630,8 +16630,8 @@ testcases68(suite) -> [].
 %% Sections: 3.4
 'ibm-not-wf-P65-ibm65n02'(suite) -> [];
 'ibm-not-wf-P65-ibm65n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P65/ibm65n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P65/ibm65n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16648,8 +16648,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P66-ibm66n01'(suite) -> [];
 'ibm-not-wf-P66-ibm66n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P66/ibm66n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16661,8 +16661,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P66-ibm66n02'(suite) -> [];
 'ibm-not-wf-P66-ibm66n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P66/ibm66n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16674,8 +16674,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P66-ibm66n03'(suite) -> [];
 'ibm-not-wf-P66-ibm66n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P66/ibm66n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16687,8 +16687,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P66-ibm66n04'(suite) -> [];
 'ibm-not-wf-P66-ibm66n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P66/ibm66n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16700,8 +16700,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P66-ibm66n05'(suite) -> [];
 'ibm-not-wf-P66-ibm66n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P66/ibm66n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16713,8 +16713,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P66-ibm66n06'(suite) -> [];
 'ibm-not-wf-P66-ibm66n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P66/ibm66n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16726,8 +16726,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P66-ibm66n07'(suite) -> [];
 'ibm-not-wf-P66-ibm66n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P66/ibm66n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16739,8 +16739,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P66-ibm66n08'(suite) -> [];
 'ibm-not-wf-P66-ibm66n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P66/ibm66n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16752,8 +16752,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P66-ibm66n09'(suite) -> [];
 'ibm-not-wf-P66-ibm66n09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P66/ibm66n09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16765,8 +16765,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P66-ibm66n10'(suite) -> [];
 'ibm-not-wf-P66-ibm66n10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P66/ibm66n10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16778,8 +16778,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P66-ibm66n11'(suite) -> [];
 'ibm-not-wf-P66-ibm66n11'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P66/ibm66n11.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n11.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16791,8 +16791,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P66-ibm66n12'(suite) -> [];
 'ibm-not-wf-P66-ibm66n12'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P66/ibm66n12.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n12.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16804,8 +16804,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P66-ibm66n13'(suite) -> [];
 'ibm-not-wf-P66-ibm66n13'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P66/ibm66n13.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n13.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16817,8 +16817,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P66-ibm66n14'(suite) -> [];
 'ibm-not-wf-P66-ibm66n14'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P66/ibm66n14.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n14.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16830,8 +16830,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P66-ibm66n15'(suite) -> [];
 'ibm-not-wf-P66-ibm66n15'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P66/ibm66n15.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P66/ibm66n15.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16848,8 +16848,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P68-ibm68n01'(suite) -> [];
 'ibm-not-wf-P68-ibm68n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P68/ibm68n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16861,8 +16861,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P68-ibm68n02'(suite) -> [];
 'ibm-not-wf-P68-ibm68n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P68/ibm68n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16874,8 +16874,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P68-ibm68n03'(suite) -> [];
 'ibm-not-wf-P68-ibm68n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P68/ibm68n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16887,8 +16887,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P68-ibm68n04'(suite) -> [];
 'ibm-not-wf-P68-ibm68n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P68/ibm68n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16900,8 +16900,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P68-ibm68n05'(suite) -> [];
 'ibm-not-wf-P68-ibm68n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P68/ibm68n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16913,8 +16913,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P68-ibm68n06'(suite) -> [];
 'ibm-not-wf-P68-ibm68n06'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P68/ibm68n06.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n06.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -16926,8 +16926,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P68-ibm68n07'(suite) -> [];
 'ibm-not-wf-P68-ibm68n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P68/ibm68n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16939,8 +16939,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P68-ibm68n08'(suite) -> [];
 'ibm-not-wf-P68-ibm68n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P68/ibm68n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16952,8 +16952,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P68-ibm68n09'(suite) -> [];
 'ibm-not-wf-P68-ibm68n09'(_Config) ->  {skip, "No loop detection yet"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P68/ibm68n09.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n09.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -16965,8 +16965,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P68-ibm68n10'(suite) -> [];
 'ibm-not-wf-P68-ibm68n10'(_Config) ->  {skip, "No loop detection yet"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P68/ibm68n10.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P68/ibm68n10.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -16983,8 +16983,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P69-ibm69n01'(suite) -> [];
 'ibm-not-wf-P69-ibm69n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P69/ibm69n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P69/ibm69n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -16996,8 +16996,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P69-ibm69n02'(suite) -> [];
 'ibm-not-wf-P69-ibm69n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P69/ibm69n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P69/ibm69n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17009,8 +17009,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P69-ibm69n03'(suite) -> [];
 'ibm-not-wf-P69-ibm69n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P69/ibm69n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P69/ibm69n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17022,8 +17022,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P69-ibm69n04'(suite) -> [];
 'ibm-not-wf-P69-ibm69n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P69/ibm69n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P69/ibm69n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17035,8 +17035,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P69-ibm69n05'(suite) -> [];
 'ibm-not-wf-P69-ibm69n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P69/ibm69n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P69/ibm69n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "error").
 
@@ -17048,8 +17048,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P69-ibm69n06'(suite) -> [];
 'ibm-not-wf-P69-ibm69n06'(_Config) ->  {skip, "No loop detection yet"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P69/ibm69n06.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P69/ibm69n06.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -17061,8 +17061,8 @@ testcases68(suite) -> [].
 %% Sections: 4.1
 'ibm-not-wf-P69-ibm69n07'(suite) -> [];
 'ibm-not-wf-P69-ibm69n07'(_Config) ->  {skip, "No loop detection yet"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P69/ibm69n07.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P69/ibm69n07.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -17079,8 +17079,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P71-ibm70n01'(suite) -> [];
 'ibm-not-wf-P71-ibm70n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P71/ibm70n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm70n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17092,8 +17092,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P71-ibm71n01'(suite) -> [];
 'ibm-not-wf-P71-ibm71n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P71/ibm71n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17105,8 +17105,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P71-ibm71n02'(suite) -> [];
 'ibm-not-wf-P71-ibm71n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P71/ibm71n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17118,8 +17118,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P71-ibm71n03'(suite) -> [];
 'ibm-not-wf-P71-ibm71n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P71/ibm71n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17131,8 +17131,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P71-ibm71n04'(suite) -> [];
 'ibm-not-wf-P71-ibm71n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P71/ibm71n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17144,8 +17144,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P71-ibm71n05'(suite) -> [];
 'ibm-not-wf-P71-ibm71n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P71/ibm71n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17157,8 +17157,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P71-ibm71n06'(suite) -> [];
 'ibm-not-wf-P71-ibm71n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P71/ibm71n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17170,8 +17170,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P71-ibm71n07'(suite) -> [];
 'ibm-not-wf-P71-ibm71n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P71/ibm71n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17183,8 +17183,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P71-ibm71n08'(suite) -> [];
 'ibm-not-wf-P71-ibm71n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P71/ibm71n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P71/ibm71n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17201,8 +17201,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P72-ibm72n01'(suite) -> [];
 'ibm-not-wf-P72-ibm72n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P72/ibm72n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17214,8 +17214,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P72-ibm72n02'(suite) -> [];
 'ibm-not-wf-P72-ibm72n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P72/ibm72n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17227,8 +17227,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P72-ibm72n03'(suite) -> [];
 'ibm-not-wf-P72-ibm72n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P72/ibm72n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17240,8 +17240,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P72-ibm72n04'(suite) -> [];
 'ibm-not-wf-P72-ibm72n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P72/ibm72n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17253,8 +17253,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P72-ibm72n05'(suite) -> [];
 'ibm-not-wf-P72-ibm72n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P72/ibm72n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17266,8 +17266,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P72-ibm72n06'(suite) -> [];
 'ibm-not-wf-P72-ibm72n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P72/ibm72n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17279,8 +17279,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P72-ibm72n07'(suite) -> [];
 'ibm-not-wf-P72-ibm72n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P72/ibm72n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17292,8 +17292,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P72-ibm72n08'(suite) -> [];
 'ibm-not-wf-P72-ibm72n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P72/ibm72n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17305,8 +17305,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P72-ibm72n09'(suite) -> [];
 'ibm-not-wf-P72-ibm72n09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P72/ibm72n09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P72/ibm72n09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17323,8 +17323,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P73-ibm73n01'(suite) -> [];
 'ibm-not-wf-P73-ibm73n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P73/ibm73n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P73/ibm73n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17336,8 +17336,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P73-ibm73n03'(suite) -> [];
 'ibm-not-wf-P73-ibm73n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P73/ibm73n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P73/ibm73n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17354,8 +17354,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2
 'ibm-not-wf-P74-ibm74n01'(suite) -> [];
 'ibm-not-wf-P74-ibm74n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P74/ibm74n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P74/ibm74n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17372,8 +17372,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P75-ibm75n01'(suite) -> [];
 'ibm-not-wf-P75-ibm75n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P75/ibm75n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17385,8 +17385,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P75-ibm75n02'(suite) -> [];
 'ibm-not-wf-P75-ibm75n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P75/ibm75n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17398,8 +17398,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P75-ibm75n03'(suite) -> [];
 'ibm-not-wf-P75-ibm75n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P75/ibm75n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17411,8 +17411,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P75-ibm75n04'(suite) -> [];
 'ibm-not-wf-P75-ibm75n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P75/ibm75n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17424,8 +17424,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P75-ibm75n05'(suite) -> [];
 'ibm-not-wf-P75-ibm75n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P75/ibm75n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17437,8 +17437,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P75-ibm75n06'(suite) -> [];
 'ibm-not-wf-P75-ibm75n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P75/ibm75n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17450,8 +17450,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P75-ibm75n07'(suite) -> [];
 'ibm-not-wf-P75-ibm75n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P75/ibm75n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17463,8 +17463,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P75-ibm75n08'(suite) -> [];
 'ibm-not-wf-P75-ibm75n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P75/ibm75n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17476,8 +17476,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P75-ibm75n09'(suite) -> [];
 'ibm-not-wf-P75-ibm75n09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P75/ibm75n09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17489,8 +17489,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P75-ibm75n10'(suite) -> [];
 'ibm-not-wf-P75-ibm75n10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P75/ibm75n10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17502,8 +17502,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P75-ibm75n11'(suite) -> [];
 'ibm-not-wf-P75-ibm75n11'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P75/ibm75n11.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n11.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17515,8 +17515,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P75-ibm75n12'(suite) -> [];
 'ibm-not-wf-P75-ibm75n12'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P75/ibm75n12.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n12.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17528,8 +17528,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P75-ibm75n13'(suite) -> [];
 'ibm-not-wf-P75-ibm75n13'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P75/ibm75n13.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P75/ibm75n13.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17546,8 +17546,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P76-ibm76n01'(suite) -> [];
 'ibm-not-wf-P76-ibm76n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P76/ibm76n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P76/ibm76n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17559,8 +17559,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P76-ibm76n02'(suite) -> [];
 'ibm-not-wf-P76-ibm76n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P76/ibm76n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P76/ibm76n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17572,8 +17572,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P76-ibm76n03'(suite) -> [];
 'ibm-not-wf-P76-ibm76n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P76/ibm76n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P76/ibm76n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17585,8 +17585,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P76-ibm76n04'(suite) -> [];
 'ibm-not-wf-P76-ibm76n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P76/ibm76n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P76/ibm76n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17598,8 +17598,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P76-ibm76n05'(suite) -> [];
 'ibm-not-wf-P76-ibm76n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P76/ibm76n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P76/ibm76n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17611,8 +17611,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P76-ibm76n06'(suite) -> [];
 'ibm-not-wf-P76-ibm76n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P76/ibm76n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P76/ibm76n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17624,8 +17624,8 @@ testcases68(suite) -> [].
 %% Sections: 4.2.2
 'ibm-not-wf-P76-ibm76n07'(suite) -> [];
 'ibm-not-wf-P76-ibm76n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P76/ibm76n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P76/ibm76n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17642,8 +17642,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.1
 'ibm-not-wf-P77-ibm77n01'(suite) -> [];
 'ibm-not-wf-P77-ibm77n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P77/ibm77n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P77/ibm77n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17655,8 +17655,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.1
 'ibm-not-wf-P77-ibm77n02'(suite) -> [];
 'ibm-not-wf-P77-ibm77n02'(Config) ->  {skip, "Fix 3"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P77/ibm77n02.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P77/ibm77n02.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "not-wf").
 
@@ -17668,8 +17668,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.1
 'ibm-not-wf-P77-ibm77n03'(suite) -> [];
 'ibm-not-wf-P77-ibm77n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P77/ibm77n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P77/ibm77n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17681,8 +17681,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.1
 'ibm-not-wf-P77-ibm77n04'(suite) -> [];
 'ibm-not-wf-P77-ibm77n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P77/ibm77n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P77/ibm77n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17699,8 +17699,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.2
 'ibm-not-wf-P78-ibm78n01'(suite) -> [];
 'ibm-not-wf-P78-ibm78n01'(Config) ->  {skip, "Fix 3"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P78/ibm78n01.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P78/ibm78n01.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "not-wf").
 
@@ -17712,8 +17712,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.2
 'ibm-not-wf-P78-ibm78n02'(suite) -> [];
 'ibm-not-wf-P78-ibm78n02'(Config) ->  {skip, "Fix 3"}.
-   %%?line file:set_cwd(?config(data_dir,Config)),
-   %%?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P78/ibm78n02.xml"]),
+   %%?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   %%?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P78/ibm78n02.xml"]),
    %%?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    %%?line check_result(R, "not-wf").
 
@@ -17730,8 +17730,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.2
 'ibm-not-wf-P79-ibm79n01'(suite) -> [];
 'ibm-not-wf-P79-ibm79n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P79/ibm79n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P79/ibm79n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17743,8 +17743,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.2
 'ibm-not-wf-P79-ibm79n02'(suite) -> [];
 'ibm-not-wf-P79-ibm79n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P79/ibm79n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P79/ibm79n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17761,8 +17761,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.3
 'ibm-not-wf-P80-ibm80n01'(suite) -> [];
 'ibm-not-wf-P80-ibm80n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P80/ibm80n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P80/ibm80n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17774,8 +17774,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.3
 'ibm-not-wf-P80-ibm80n02'(suite) -> [];
 'ibm-not-wf-P80-ibm80n02'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P80/ibm80n02.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P80/ibm80n02.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -17787,8 +17787,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.3
 'ibm-not-wf-P80-ibm80n03'(suite) -> [];
 'ibm-not-wf-P80-ibm80n03'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P80/ibm80n03.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P80/ibm80n03.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "not-wf").
 
@@ -17800,8 +17800,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.3
 'ibm-not-wf-P80-ibm80n04'(suite) -> [];
 'ibm-not-wf-P80-ibm80n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P80/ibm80n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P80/ibm80n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17813,8 +17813,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.3
 'ibm-not-wf-P80-ibm80n05'(suite) -> [];
 'ibm-not-wf-P80-ibm80n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P80/ibm80n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P80/ibm80n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17826,8 +17826,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.3
 'ibm-not-wf-P80-ibm80n06'(suite) -> [];
 'ibm-not-wf-P80-ibm80n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P80/ibm80n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P80/ibm80n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17844,8 +17844,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.3
 'ibm-not-wf-P81-ibm81n01'(suite) -> [];
 'ibm-not-wf-P81-ibm81n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P81/ibm81n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17857,8 +17857,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.3
 'ibm-not-wf-P81-ibm81n02'(suite) -> [];
 'ibm-not-wf-P81-ibm81n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P81/ibm81n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17870,8 +17870,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.3
 'ibm-not-wf-P81-ibm81n03'(suite) -> [];
 'ibm-not-wf-P81-ibm81n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P81/ibm81n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17883,8 +17883,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.3
 'ibm-not-wf-P81-ibm81n04'(suite) -> [];
 'ibm-not-wf-P81-ibm81n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P81/ibm81n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17896,8 +17896,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.3
 'ibm-not-wf-P81-ibm81n05'(suite) -> [];
 'ibm-not-wf-P81-ibm81n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P81/ibm81n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17909,8 +17909,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.3
 'ibm-not-wf-P81-ibm81n06'(suite) -> [];
 'ibm-not-wf-P81-ibm81n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P81/ibm81n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17922,8 +17922,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.3
 'ibm-not-wf-P81-ibm81n07'(suite) -> [];
 'ibm-not-wf-P81-ibm81n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P81/ibm81n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17935,8 +17935,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.3
 'ibm-not-wf-P81-ibm81n08'(suite) -> [];
 'ibm-not-wf-P81-ibm81n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P81/ibm81n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17948,8 +17948,8 @@ testcases68(suite) -> [].
 %% Sections: 4.3.3
 'ibm-not-wf-P81-ibm81n09'(suite) -> [];
 'ibm-not-wf-P81-ibm81n09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P81/ibm81n09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P81/ibm81n09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17966,8 +17966,8 @@ testcases68(suite) -> [].
 %% Sections: 4.7
 'ibm-not-wf-P82-ibm82n01'(suite) -> [];
 'ibm-not-wf-P82-ibm82n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P82/ibm82n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17979,8 +17979,8 @@ testcases68(suite) -> [].
 %% Sections: 4.7
 'ibm-not-wf-P82-ibm82n02'(suite) -> [];
 'ibm-not-wf-P82-ibm82n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P82/ibm82n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -17992,8 +17992,8 @@ testcases68(suite) -> [].
 %% Sections: 4.7
 'ibm-not-wf-P82-ibm82n03'(suite) -> [];
 'ibm-not-wf-P82-ibm82n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P82/ibm82n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18005,8 +18005,8 @@ testcases68(suite) -> [].
 %% Sections: 4.7
 'ibm-not-wf-P82-ibm82n04'(suite) -> [];
 'ibm-not-wf-P82-ibm82n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P82/ibm82n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18018,8 +18018,8 @@ testcases68(suite) -> [].
 %% Sections: 4.7
 'ibm-not-wf-P82-ibm82n05'(suite) -> [];
 'ibm-not-wf-P82-ibm82n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P82/ibm82n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18031,8 +18031,8 @@ testcases68(suite) -> [].
 %% Sections: 4.7
 'ibm-not-wf-P82-ibm82n06'(suite) -> [];
 'ibm-not-wf-P82-ibm82n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P82/ibm82n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18044,8 +18044,8 @@ testcases68(suite) -> [].
 %% Sections: 4.7
 'ibm-not-wf-P82-ibm82n07'(suite) -> [];
 'ibm-not-wf-P82-ibm82n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P82/ibm82n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18057,8 +18057,8 @@ testcases68(suite) -> [].
 %% Sections: 4.7
 'ibm-not-wf-P82-ibm82n08'(suite) -> [];
 'ibm-not-wf-P82-ibm82n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P82/ibm82n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P82/ibm82n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18075,8 +18075,8 @@ testcases68(suite) -> [].
 %% Sections: 4.7
 'ibm-not-wf-P83-ibm83n01'(suite) -> [];
 'ibm-not-wf-P83-ibm83n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P83/ibm83n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P83/ibm83n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18088,8 +18088,8 @@ testcases68(suite) -> [].
 %% Sections: 4.7
 'ibm-not-wf-P83-ibm83n02'(suite) -> [];
 'ibm-not-wf-P83-ibm83n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P83/ibm83n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P83/ibm83n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18101,8 +18101,8 @@ testcases68(suite) -> [].
 %% Sections: 4.7
 'ibm-not-wf-P83-ibm83n03'(suite) -> [];
 'ibm-not-wf-P83-ibm83n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P83/ibm83n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P83/ibm83n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18114,8 +18114,8 @@ testcases68(suite) -> [].
 %% Sections: 4.7
 'ibm-not-wf-P83-ibm83n04'(suite) -> [];
 'ibm-not-wf-P83-ibm83n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P83/ibm83n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P83/ibm83n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18127,8 +18127,8 @@ testcases68(suite) -> [].
 %% Sections: 4.7
 'ibm-not-wf-P83-ibm83n05'(suite) -> [];
 'ibm-not-wf-P83-ibm83n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P83/ibm83n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P83/ibm83n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18140,8 +18140,8 @@ testcases68(suite) -> [].
 %% Sections: 4.7
 'ibm-not-wf-P83-ibm83n06'(suite) -> [];
 'ibm-not-wf-P83-ibm83n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P83/ibm83n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P83/ibm83n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18158,8 +18158,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n01'(suite) -> [];
 'ibm-not-wf-P85-ibm85n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18171,8 +18171,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n02'(suite) -> [];
 'ibm-not-wf-P85-ibm85n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18184,8 +18184,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n03'(suite) -> [];
 'ibm-not-wf-P85-ibm85n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18197,8 +18197,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n04'(suite) -> [];
 'ibm-not-wf-P85-ibm85n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18210,8 +18210,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n05'(suite) -> [];
 'ibm-not-wf-P85-ibm85n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18223,8 +18223,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n06'(suite) -> [];
 'ibm-not-wf-P85-ibm85n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18236,8 +18236,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n07'(suite) -> [];
 'ibm-not-wf-P85-ibm85n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18249,8 +18249,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n08'(suite) -> [];
 'ibm-not-wf-P85-ibm85n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18262,8 +18262,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n09'(suite) -> [];
 'ibm-not-wf-P85-ibm85n09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18275,8 +18275,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n10'(suite) -> [];
 'ibm-not-wf-P85-ibm85n10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18288,8 +18288,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n100'(suite) -> [];
 'ibm-not-wf-P85-ibm85n100'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n100.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n100.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18301,8 +18301,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n101'(suite) -> [];
 'ibm-not-wf-P85-ibm85n101'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n101.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n101.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18314,8 +18314,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n102'(suite) -> [];
 'ibm-not-wf-P85-ibm85n102'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n102.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n102.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18327,8 +18327,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n103'(suite) -> [];
 'ibm-not-wf-P85-ibm85n103'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n103.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n103.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18340,8 +18340,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n104'(suite) -> [];
 'ibm-not-wf-P85-ibm85n104'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n104.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n104.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18353,8 +18353,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n105'(suite) -> [];
 'ibm-not-wf-P85-ibm85n105'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n105.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n105.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18366,8 +18366,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n106'(suite) -> [];
 'ibm-not-wf-P85-ibm85n106'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n106.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n106.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18379,8 +18379,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n107'(suite) -> [];
 'ibm-not-wf-P85-ibm85n107'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n107.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n107.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18392,8 +18392,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n108'(suite) -> [];
 'ibm-not-wf-P85-ibm85n108'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n108.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n108.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18405,8 +18405,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n109'(suite) -> [];
 'ibm-not-wf-P85-ibm85n109'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n109.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n109.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18418,8 +18418,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n11'(suite) -> [];
 'ibm-not-wf-P85-ibm85n11'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n11.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n11.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18431,8 +18431,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n110'(suite) -> [];
 'ibm-not-wf-P85-ibm85n110'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n110.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n110.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18444,8 +18444,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n111'(suite) -> [];
 'ibm-not-wf-P85-ibm85n111'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n111.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n111.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18457,8 +18457,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n112'(suite) -> [];
 'ibm-not-wf-P85-ibm85n112'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n112.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n112.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18470,8 +18470,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n113'(suite) -> [];
 'ibm-not-wf-P85-ibm85n113'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n113.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n113.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18483,8 +18483,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n114'(suite) -> [];
 'ibm-not-wf-P85-ibm85n114'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n114.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n114.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18496,8 +18496,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n115'(suite) -> [];
 'ibm-not-wf-P85-ibm85n115'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n115.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n115.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18509,8 +18509,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n116'(suite) -> [];
 'ibm-not-wf-P85-ibm85n116'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n116.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n116.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18522,8 +18522,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n117'(suite) -> [];
 'ibm-not-wf-P85-ibm85n117'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n117.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n117.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18535,8 +18535,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n118'(suite) -> [];
 'ibm-not-wf-P85-ibm85n118'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n118.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n118.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18548,8 +18548,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n119'(suite) -> [];
 'ibm-not-wf-P85-ibm85n119'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n119.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n119.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18561,8 +18561,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n12'(suite) -> [];
 'ibm-not-wf-P85-ibm85n12'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n12.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n12.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18574,8 +18574,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n120'(suite) -> [];
 'ibm-not-wf-P85-ibm85n120'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n120.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n120.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18587,8 +18587,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n121'(suite) -> [];
 'ibm-not-wf-P85-ibm85n121'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n121.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n121.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18600,8 +18600,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n122'(suite) -> [];
 'ibm-not-wf-P85-ibm85n122'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n122.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n122.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18613,8 +18613,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n123'(suite) -> [];
 'ibm-not-wf-P85-ibm85n123'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n123.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n123.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18626,8 +18626,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n124'(suite) -> [];
 'ibm-not-wf-P85-ibm85n124'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n124.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n124.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18639,8 +18639,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n125'(suite) -> [];
 'ibm-not-wf-P85-ibm85n125'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n125.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n125.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18652,8 +18652,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n126'(suite) -> [];
 'ibm-not-wf-P85-ibm85n126'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n126.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n126.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18665,8 +18665,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n127'(suite) -> [];
 'ibm-not-wf-P85-ibm85n127'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n127.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n127.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18678,8 +18678,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n128'(suite) -> [];
 'ibm-not-wf-P85-ibm85n128'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n128.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n128.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18691,8 +18691,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n129'(suite) -> [];
 'ibm-not-wf-P85-ibm85n129'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n129.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n129.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18704,8 +18704,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n13'(suite) -> [];
 'ibm-not-wf-P85-ibm85n13'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n13.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n13.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18717,8 +18717,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n130'(suite) -> [];
 'ibm-not-wf-P85-ibm85n130'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n130.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n130.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18730,8 +18730,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n131'(suite) -> [];
 'ibm-not-wf-P85-ibm85n131'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n131.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n131.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18743,8 +18743,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n132'(suite) -> [];
 'ibm-not-wf-P85-ibm85n132'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n132.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n132.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18756,8 +18756,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n133'(suite) -> [];
 'ibm-not-wf-P85-ibm85n133'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n133.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n133.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18769,8 +18769,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n134'(suite) -> [];
 'ibm-not-wf-P85-ibm85n134'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n134.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n134.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18782,8 +18782,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n135'(suite) -> [];
 'ibm-not-wf-P85-ibm85n135'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n135.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n135.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18795,8 +18795,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n136'(suite) -> [];
 'ibm-not-wf-P85-ibm85n136'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n136.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n136.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18808,8 +18808,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n137'(suite) -> [];
 'ibm-not-wf-P85-ibm85n137'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n137.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n137.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18821,8 +18821,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n138'(suite) -> [];
 'ibm-not-wf-P85-ibm85n138'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n138.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n138.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18834,8 +18834,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n139'(suite) -> [];
 'ibm-not-wf-P85-ibm85n139'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n139.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n139.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18847,8 +18847,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n14'(suite) -> [];
 'ibm-not-wf-P85-ibm85n14'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n14.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n14.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18860,8 +18860,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n140'(suite) -> [];
 'ibm-not-wf-P85-ibm85n140'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n140.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n140.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18873,8 +18873,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n141'(suite) -> [];
 'ibm-not-wf-P85-ibm85n141'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n141.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n141.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18886,8 +18886,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n142'(suite) -> [];
 'ibm-not-wf-P85-ibm85n142'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n142.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n142.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18899,8 +18899,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n143'(suite) -> [];
 'ibm-not-wf-P85-ibm85n143'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n143.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n143.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18912,8 +18912,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n144'(suite) -> [];
 'ibm-not-wf-P85-ibm85n144'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n144.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n144.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18925,8 +18925,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n145'(suite) -> [];
 'ibm-not-wf-P85-ibm85n145'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n145.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n145.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18938,8 +18938,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n146'(suite) -> [];
 'ibm-not-wf-P85-ibm85n146'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n146.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n146.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18951,8 +18951,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n147'(suite) -> [];
 'ibm-not-wf-P85-ibm85n147'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n147.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n147.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18964,8 +18964,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n148'(suite) -> [];
 'ibm-not-wf-P85-ibm85n148'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n148.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n148.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18977,8 +18977,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n149'(suite) -> [];
 'ibm-not-wf-P85-ibm85n149'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n149.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n149.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -18990,8 +18990,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n15'(suite) -> [];
 'ibm-not-wf-P85-ibm85n15'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n15.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n15.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19003,8 +19003,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n150'(suite) -> [];
 'ibm-not-wf-P85-ibm85n150'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n150.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n150.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19016,8 +19016,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n151'(suite) -> [];
 'ibm-not-wf-P85-ibm85n151'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n151.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n151.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19029,8 +19029,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n152'(suite) -> [];
 'ibm-not-wf-P85-ibm85n152'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n152.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n152.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19042,8 +19042,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n153'(suite) -> [];
 'ibm-not-wf-P85-ibm85n153'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n153.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n153.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19055,8 +19055,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n154'(suite) -> [];
 'ibm-not-wf-P85-ibm85n154'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n154.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n154.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19068,8 +19068,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n155'(suite) -> [];
 'ibm-not-wf-P85-ibm85n155'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n155.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n155.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19081,8 +19081,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n156'(suite) -> [];
 'ibm-not-wf-P85-ibm85n156'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n156.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n156.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19094,8 +19094,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n157'(suite) -> [];
 'ibm-not-wf-P85-ibm85n157'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n157.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n157.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19107,8 +19107,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n158'(suite) -> [];
 'ibm-not-wf-P85-ibm85n158'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n158.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n158.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19120,8 +19120,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n159'(suite) -> [];
 'ibm-not-wf-P85-ibm85n159'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n159.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n159.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19133,8 +19133,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n16'(suite) -> [];
 'ibm-not-wf-P85-ibm85n16'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n16.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n16.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19146,8 +19146,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n160'(suite) -> [];
 'ibm-not-wf-P85-ibm85n160'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n160.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n160.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19159,8 +19159,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n161'(suite) -> [];
 'ibm-not-wf-P85-ibm85n161'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n161.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n161.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19172,8 +19172,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n162'(suite) -> [];
 'ibm-not-wf-P85-ibm85n162'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n162.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n162.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19185,8 +19185,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n163'(suite) -> [];
 'ibm-not-wf-P85-ibm85n163'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n163.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n163.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19198,8 +19198,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n164'(suite) -> [];
 'ibm-not-wf-P85-ibm85n164'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n164.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n164.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19211,8 +19211,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n165'(suite) -> [];
 'ibm-not-wf-P85-ibm85n165'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n165.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n165.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19224,8 +19224,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n166'(suite) -> [];
 'ibm-not-wf-P85-ibm85n166'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n166.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n166.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19237,8 +19237,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n167'(suite) -> [];
 'ibm-not-wf-P85-ibm85n167'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n167.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n167.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19250,8 +19250,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n168'(suite) -> [];
 'ibm-not-wf-P85-ibm85n168'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n168.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n168.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19263,8 +19263,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n169'(suite) -> [];
 'ibm-not-wf-P85-ibm85n169'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n169.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n169.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19276,8 +19276,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n17'(suite) -> [];
 'ibm-not-wf-P85-ibm85n17'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n17.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n17.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19289,8 +19289,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n170'(suite) -> [];
 'ibm-not-wf-P85-ibm85n170'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n170.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n170.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19302,8 +19302,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n171'(suite) -> [];
 'ibm-not-wf-P85-ibm85n171'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n171.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n171.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19315,8 +19315,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n172'(suite) -> [];
 'ibm-not-wf-P85-ibm85n172'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n172.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n172.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19328,8 +19328,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n173'(suite) -> [];
 'ibm-not-wf-P85-ibm85n173'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n173.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n173.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19341,8 +19341,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n174'(suite) -> [];
 'ibm-not-wf-P85-ibm85n174'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n174.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n174.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19354,8 +19354,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n175'(suite) -> [];
 'ibm-not-wf-P85-ibm85n175'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n175.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n175.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19367,8 +19367,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n176'(suite) -> [];
 'ibm-not-wf-P85-ibm85n176'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n176.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n176.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19380,8 +19380,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n177'(suite) -> [];
 'ibm-not-wf-P85-ibm85n177'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n177.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n177.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19393,8 +19393,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n178'(suite) -> [];
 'ibm-not-wf-P85-ibm85n178'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n178.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n178.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19406,8 +19406,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n179'(suite) -> [];
 'ibm-not-wf-P85-ibm85n179'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n179.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n179.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19419,8 +19419,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n18'(suite) -> [];
 'ibm-not-wf-P85-ibm85n18'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n18.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n18.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19432,8 +19432,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n180'(suite) -> [];
 'ibm-not-wf-P85-ibm85n180'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n180.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n180.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19445,8 +19445,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n181'(suite) -> [];
 'ibm-not-wf-P85-ibm85n181'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n181.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n181.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19458,8 +19458,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n182'(suite) -> [];
 'ibm-not-wf-P85-ibm85n182'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n182.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n182.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19471,8 +19471,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n183'(suite) -> [];
 'ibm-not-wf-P85-ibm85n183'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n183.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n183.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19484,8 +19484,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n184'(suite) -> [];
 'ibm-not-wf-P85-ibm85n184'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n184.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n184.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19497,8 +19497,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n185'(suite) -> [];
 'ibm-not-wf-P85-ibm85n185'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n185.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n185.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19510,8 +19510,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n186'(suite) -> [];
 'ibm-not-wf-P85-ibm85n186'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n186.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n186.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19523,8 +19523,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n187'(suite) -> [];
 'ibm-not-wf-P85-ibm85n187'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n187.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n187.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19536,8 +19536,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n188'(suite) -> [];
 'ibm-not-wf-P85-ibm85n188'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n188.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n188.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19549,8 +19549,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n189'(suite) -> [];
 'ibm-not-wf-P85-ibm85n189'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n189.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n189.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19562,8 +19562,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n19'(suite) -> [];
 'ibm-not-wf-P85-ibm85n19'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n19.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n19.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19575,8 +19575,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n190'(suite) -> [];
 'ibm-not-wf-P85-ibm85n190'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n190.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n190.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19588,8 +19588,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n191'(suite) -> [];
 'ibm-not-wf-P85-ibm85n191'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n191.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n191.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19601,8 +19601,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n192'(suite) -> [];
 'ibm-not-wf-P85-ibm85n192'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n192.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n192.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19614,8 +19614,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n193'(suite) -> [];
 'ibm-not-wf-P85-ibm85n193'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n193.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n193.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19627,8 +19627,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n194'(suite) -> [];
 'ibm-not-wf-P85-ibm85n194'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n194.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n194.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19640,8 +19640,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n195'(suite) -> [];
 'ibm-not-wf-P85-ibm85n195'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n195.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n195.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19653,8 +19653,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n196'(suite) -> [];
 'ibm-not-wf-P85-ibm85n196'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n196.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n196.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19666,8 +19666,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n197'(suite) -> [];
 'ibm-not-wf-P85-ibm85n197'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n197.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n197.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19679,8 +19679,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n198'(suite) -> [];
 'ibm-not-wf-P85-ibm85n198'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n198.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n198.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19692,8 +19692,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n20'(suite) -> [];
 'ibm-not-wf-P85-ibm85n20'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n20.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n20.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19705,8 +19705,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n21'(suite) -> [];
 'ibm-not-wf-P85-ibm85n21'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n21.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n21.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19718,8 +19718,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n22'(suite) -> [];
 'ibm-not-wf-P85-ibm85n22'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n22.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n22.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19731,8 +19731,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n23'(suite) -> [];
 'ibm-not-wf-P85-ibm85n23'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n23.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n23.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19744,8 +19744,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n24'(suite) -> [];
 'ibm-not-wf-P85-ibm85n24'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n24.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n24.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19757,8 +19757,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n25'(suite) -> [];
 'ibm-not-wf-P85-ibm85n25'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n25.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n25.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19770,8 +19770,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n26'(suite) -> [];
 'ibm-not-wf-P85-ibm85n26'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n26.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n26.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19783,8 +19783,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n27'(suite) -> [];
 'ibm-not-wf-P85-ibm85n27'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n27.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n27.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19796,8 +19796,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n28'(suite) -> [];
 'ibm-not-wf-P85-ibm85n28'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n28.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n28.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19809,8 +19809,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n29'(suite) -> [];
 'ibm-not-wf-P85-ibm85n29'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n29.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n29.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19822,8 +19822,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n30'(suite) -> [];
 'ibm-not-wf-P85-ibm85n30'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n30.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n30.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19835,8 +19835,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n31'(suite) -> [];
 'ibm-not-wf-P85-ibm85n31'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n31.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n31.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19848,8 +19848,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n32'(suite) -> [];
 'ibm-not-wf-P85-ibm85n32'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n32.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n32.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19861,8 +19861,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n33'(suite) -> [];
 'ibm-not-wf-P85-ibm85n33'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n33.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n33.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19874,8 +19874,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n34'(suite) -> [];
 'ibm-not-wf-P85-ibm85n34'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n34.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n34.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19887,8 +19887,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n35'(suite) -> [];
 'ibm-not-wf-P85-ibm85n35'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n35.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n35.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19900,8 +19900,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n36'(suite) -> [];
 'ibm-not-wf-P85-ibm85n36'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n36.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n36.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19913,8 +19913,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n37'(suite) -> [];
 'ibm-not-wf-P85-ibm85n37'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n37.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n37.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19926,8 +19926,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n38'(suite) -> [];
 'ibm-not-wf-P85-ibm85n38'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n38.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n38.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19939,8 +19939,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n39'(suite) -> [];
 'ibm-not-wf-P85-ibm85n39'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n39.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n39.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19952,8 +19952,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n40'(suite) -> [];
 'ibm-not-wf-P85-ibm85n40'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n40.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n40.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19965,8 +19965,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n41'(suite) -> [];
 'ibm-not-wf-P85-ibm85n41'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n41.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n41.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19978,8 +19978,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n42'(suite) -> [];
 'ibm-not-wf-P85-ibm85n42'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n42.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n42.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -19991,8 +19991,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n43'(suite) -> [];
 'ibm-not-wf-P85-ibm85n43'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n43.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n43.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20004,8 +20004,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n44'(suite) -> [];
 'ibm-not-wf-P85-ibm85n44'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n44.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n44.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20017,8 +20017,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n45'(suite) -> [];
 'ibm-not-wf-P85-ibm85n45'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n45.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n45.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20030,8 +20030,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n46'(suite) -> [];
 'ibm-not-wf-P85-ibm85n46'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n46.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n46.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20043,8 +20043,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n47'(suite) -> [];
 'ibm-not-wf-P85-ibm85n47'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n47.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n47.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20056,8 +20056,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n48'(suite) -> [];
 'ibm-not-wf-P85-ibm85n48'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n48.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n48.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20069,8 +20069,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n49'(suite) -> [];
 'ibm-not-wf-P85-ibm85n49'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n49.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n49.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20082,8 +20082,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n50'(suite) -> [];
 'ibm-not-wf-P85-ibm85n50'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n50.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n50.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20095,8 +20095,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n51'(suite) -> [];
 'ibm-not-wf-P85-ibm85n51'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n51.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n51.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20108,8 +20108,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n52'(suite) -> [];
 'ibm-not-wf-P85-ibm85n52'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n52.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n52.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20121,8 +20121,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n53'(suite) -> [];
 'ibm-not-wf-P85-ibm85n53'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n53.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n53.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20134,8 +20134,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n54'(suite) -> [];
 'ibm-not-wf-P85-ibm85n54'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n54.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n54.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20147,8 +20147,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n55'(suite) -> [];
 'ibm-not-wf-P85-ibm85n55'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n55.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n55.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20160,8 +20160,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n56'(suite) -> [];
 'ibm-not-wf-P85-ibm85n56'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n56.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n56.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20173,8 +20173,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n57'(suite) -> [];
 'ibm-not-wf-P85-ibm85n57'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n57.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n57.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20186,8 +20186,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n58'(suite) -> [];
 'ibm-not-wf-P85-ibm85n58'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n58.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n58.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20199,8 +20199,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n59'(suite) -> [];
 'ibm-not-wf-P85-ibm85n59'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n59.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n59.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20212,8 +20212,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n60'(suite) -> [];
 'ibm-not-wf-P85-ibm85n60'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n60.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n60.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20225,8 +20225,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n61'(suite) -> [];
 'ibm-not-wf-P85-ibm85n61'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n61.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n61.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20238,8 +20238,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n62'(suite) -> [];
 'ibm-not-wf-P85-ibm85n62'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n62.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n62.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20251,8 +20251,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n63'(suite) -> [];
 'ibm-not-wf-P85-ibm85n63'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n63.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n63.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20264,8 +20264,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n64'(suite) -> [];
 'ibm-not-wf-P85-ibm85n64'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n64.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n64.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20277,8 +20277,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n65'(suite) -> [];
 'ibm-not-wf-P85-ibm85n65'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n65.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n65.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20290,8 +20290,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n66'(suite) -> [];
 'ibm-not-wf-P85-ibm85n66'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n66.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n66.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20303,8 +20303,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n67'(suite) -> [];
 'ibm-not-wf-P85-ibm85n67'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n67.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n67.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20316,8 +20316,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n68'(suite) -> [];
 'ibm-not-wf-P85-ibm85n68'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n68.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n68.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20329,8 +20329,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n69'(suite) -> [];
 'ibm-not-wf-P85-ibm85n69'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n69.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n69.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20342,8 +20342,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n70'(suite) -> [];
 'ibm-not-wf-P85-ibm85n70'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n70.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n70.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20355,8 +20355,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n71'(suite) -> [];
 'ibm-not-wf-P85-ibm85n71'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n71.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n71.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20368,8 +20368,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n72'(suite) -> [];
 'ibm-not-wf-P85-ibm85n72'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n72.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n72.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20381,8 +20381,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n73'(suite) -> [];
 'ibm-not-wf-P85-ibm85n73'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n73.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n73.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20394,8 +20394,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n74'(suite) -> [];
 'ibm-not-wf-P85-ibm85n74'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n74.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n74.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20407,8 +20407,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n75'(suite) -> [];
 'ibm-not-wf-P85-ibm85n75'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n75.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n75.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20420,8 +20420,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n76'(suite) -> [];
 'ibm-not-wf-P85-ibm85n76'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n76.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n76.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20433,8 +20433,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n77'(suite) -> [];
 'ibm-not-wf-P85-ibm85n77'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n77.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n77.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20446,8 +20446,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n78'(suite) -> [];
 'ibm-not-wf-P85-ibm85n78'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n78.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n78.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20459,8 +20459,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n79'(suite) -> [];
 'ibm-not-wf-P85-ibm85n79'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n79.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n79.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20472,8 +20472,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n80'(suite) -> [];
 'ibm-not-wf-P85-ibm85n80'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n80.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n80.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20485,8 +20485,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n81'(suite) -> [];
 'ibm-not-wf-P85-ibm85n81'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n81.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n81.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20498,8 +20498,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n82'(suite) -> [];
 'ibm-not-wf-P85-ibm85n82'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n82.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n82.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20511,8 +20511,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n83'(suite) -> [];
 'ibm-not-wf-P85-ibm85n83'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n83.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n83.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20524,8 +20524,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n84'(suite) -> [];
 'ibm-not-wf-P85-ibm85n84'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n84.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n84.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20537,8 +20537,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n85'(suite) -> [];
 'ibm-not-wf-P85-ibm85n85'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n85.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n85.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20550,8 +20550,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n86'(suite) -> [];
 'ibm-not-wf-P85-ibm85n86'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n86.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n86.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20563,8 +20563,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n87'(suite) -> [];
 'ibm-not-wf-P85-ibm85n87'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n87.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n87.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20576,8 +20576,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n88'(suite) -> [];
 'ibm-not-wf-P85-ibm85n88'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n88.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n88.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20589,8 +20589,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n89'(suite) -> [];
 'ibm-not-wf-P85-ibm85n89'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n89.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n89.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20602,8 +20602,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n90'(suite) -> [];
 'ibm-not-wf-P85-ibm85n90'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n90.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n90.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20615,8 +20615,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n91'(suite) -> [];
 'ibm-not-wf-P85-ibm85n91'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n91.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n91.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20628,8 +20628,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n92'(suite) -> [];
 'ibm-not-wf-P85-ibm85n92'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n92.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n92.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20641,8 +20641,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n93'(suite) -> [];
 'ibm-not-wf-P85-ibm85n93'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n93.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n93.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20654,8 +20654,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n94'(suite) -> [];
 'ibm-not-wf-P85-ibm85n94'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n94.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n94.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20667,8 +20667,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n95'(suite) -> [];
 'ibm-not-wf-P85-ibm85n95'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n95.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n95.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20680,8 +20680,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n96'(suite) -> [];
 'ibm-not-wf-P85-ibm85n96'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n96.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n96.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20693,8 +20693,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n97'(suite) -> [];
 'ibm-not-wf-P85-ibm85n97'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n97.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n97.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20706,8 +20706,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n98'(suite) -> [];
 'ibm-not-wf-P85-ibm85n98'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n98.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n98.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20719,8 +20719,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P85-ibm85n99'(suite) -> [];
 'ibm-not-wf-P85-ibm85n99'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P85/ibm85n99.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P85/ibm85n99.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20737,8 +20737,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P86-ibm86n01'(suite) -> [];
 'ibm-not-wf-P86-ibm86n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P86/ibm86n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P86/ibm86n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20750,8 +20750,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P86-ibm86n02'(suite) -> [];
 'ibm-not-wf-P86-ibm86n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P86/ibm86n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P86/ibm86n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20763,8 +20763,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P86-ibm86n03'(suite) -> [];
 'ibm-not-wf-P86-ibm86n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P86/ibm86n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P86/ibm86n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20776,8 +20776,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P86-ibm86n04'(suite) -> [];
 'ibm-not-wf-P86-ibm86n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P86/ibm86n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P86/ibm86n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20794,8 +20794,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n01'(suite) -> [];
 'ibm-not-wf-P87-ibm87n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20807,8 +20807,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n02'(suite) -> [];
 'ibm-not-wf-P87-ibm87n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20820,8 +20820,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n03'(suite) -> [];
 'ibm-not-wf-P87-ibm87n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20833,8 +20833,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n04'(suite) -> [];
 'ibm-not-wf-P87-ibm87n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20846,8 +20846,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n05'(suite) -> [];
 'ibm-not-wf-P87-ibm87n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20859,8 +20859,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n06'(suite) -> [];
 'ibm-not-wf-P87-ibm87n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20872,8 +20872,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n07'(suite) -> [];
 'ibm-not-wf-P87-ibm87n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20885,8 +20885,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n08'(suite) -> [];
 'ibm-not-wf-P87-ibm87n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20898,8 +20898,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n09'(suite) -> [];
 'ibm-not-wf-P87-ibm87n09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20911,8 +20911,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n10'(suite) -> [];
 'ibm-not-wf-P87-ibm87n10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20924,8 +20924,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n11'(suite) -> [];
 'ibm-not-wf-P87-ibm87n11'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n11.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n11.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20937,8 +20937,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n12'(suite) -> [];
 'ibm-not-wf-P87-ibm87n12'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n12.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n12.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20950,8 +20950,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n13'(suite) -> [];
 'ibm-not-wf-P87-ibm87n13'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n13.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n13.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20963,8 +20963,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n14'(suite) -> [];
 'ibm-not-wf-P87-ibm87n14'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n14.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n14.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20976,8 +20976,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n15'(suite) -> [];
 'ibm-not-wf-P87-ibm87n15'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n15.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n15.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -20989,8 +20989,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n16'(suite) -> [];
 'ibm-not-wf-P87-ibm87n16'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n16.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n16.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21002,8 +21002,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n17'(suite) -> [];
 'ibm-not-wf-P87-ibm87n17'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n17.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n17.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21015,8 +21015,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n18'(suite) -> [];
 'ibm-not-wf-P87-ibm87n18'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n18.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n18.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21028,8 +21028,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n19'(suite) -> [];
 'ibm-not-wf-P87-ibm87n19'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n19.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n19.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21041,8 +21041,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n20'(suite) -> [];
 'ibm-not-wf-P87-ibm87n20'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n20.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n20.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21054,8 +21054,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n21'(suite) -> [];
 'ibm-not-wf-P87-ibm87n21'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n21.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n21.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21067,8 +21067,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n22'(suite) -> [];
 'ibm-not-wf-P87-ibm87n22'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n22.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n22.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21080,8 +21080,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n23'(suite) -> [];
 'ibm-not-wf-P87-ibm87n23'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n23.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n23.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21093,8 +21093,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n24'(suite) -> [];
 'ibm-not-wf-P87-ibm87n24'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n24.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n24.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21106,8 +21106,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n25'(suite) -> [];
 'ibm-not-wf-P87-ibm87n25'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n25.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n25.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21119,8 +21119,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n26'(suite) -> [];
 'ibm-not-wf-P87-ibm87n26'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n26.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n26.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21132,8 +21132,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n27'(suite) -> [];
 'ibm-not-wf-P87-ibm87n27'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n27.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n27.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21145,8 +21145,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n28'(suite) -> [];
 'ibm-not-wf-P87-ibm87n28'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n28.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n28.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21158,8 +21158,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n29'(suite) -> [];
 'ibm-not-wf-P87-ibm87n29'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n29.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n29.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21171,8 +21171,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n30'(suite) -> [];
 'ibm-not-wf-P87-ibm87n30'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n30.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n30.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21184,8 +21184,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n31'(suite) -> [];
 'ibm-not-wf-P87-ibm87n31'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n31.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n31.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21197,8 +21197,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n32'(suite) -> [];
 'ibm-not-wf-P87-ibm87n32'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n32.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n32.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21210,8 +21210,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n33'(suite) -> [];
 'ibm-not-wf-P87-ibm87n33'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n33.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n33.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21223,8 +21223,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n34'(suite) -> [];
 'ibm-not-wf-P87-ibm87n34'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n34.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n34.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21236,8 +21236,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n35'(suite) -> [];
 'ibm-not-wf-P87-ibm87n35'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n35.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n35.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21249,8 +21249,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n36'(suite) -> [];
 'ibm-not-wf-P87-ibm87n36'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n36.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n36.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21262,8 +21262,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n37'(suite) -> [];
 'ibm-not-wf-P87-ibm87n37'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n37.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n37.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21275,8 +21275,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n38'(suite) -> [];
 'ibm-not-wf-P87-ibm87n38'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n38.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n38.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21288,8 +21288,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n39'(suite) -> [];
 'ibm-not-wf-P87-ibm87n39'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n39.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n39.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21301,8 +21301,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n40'(suite) -> [];
 'ibm-not-wf-P87-ibm87n40'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n40.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n40.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21314,8 +21314,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n41'(suite) -> [];
 'ibm-not-wf-P87-ibm87n41'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n41.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n41.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21327,8 +21327,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n42'(suite) -> [];
 'ibm-not-wf-P87-ibm87n42'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n42.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n42.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21340,8 +21340,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n43'(suite) -> [];
 'ibm-not-wf-P87-ibm87n43'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n43.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n43.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21353,8 +21353,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n44'(suite) -> [];
 'ibm-not-wf-P87-ibm87n44'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n44.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n44.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21366,8 +21366,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n45'(suite) -> [];
 'ibm-not-wf-P87-ibm87n45'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n45.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n45.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21379,8 +21379,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n46'(suite) -> [];
 'ibm-not-wf-P87-ibm87n46'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n46.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n46.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21392,8 +21392,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n47'(suite) -> [];
 'ibm-not-wf-P87-ibm87n47'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n47.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n47.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21405,8 +21405,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n48'(suite) -> [];
 'ibm-not-wf-P87-ibm87n48'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n48.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n48.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21418,8 +21418,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n49'(suite) -> [];
 'ibm-not-wf-P87-ibm87n49'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n49.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n49.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21431,8 +21431,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n50'(suite) -> [];
 'ibm-not-wf-P87-ibm87n50'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n50.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n50.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21444,8 +21444,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n51'(suite) -> [];
 'ibm-not-wf-P87-ibm87n51'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n51.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n51.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21457,8 +21457,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n52'(suite) -> [];
 'ibm-not-wf-P87-ibm87n52'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n52.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n52.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21470,8 +21470,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n53'(suite) -> [];
 'ibm-not-wf-P87-ibm87n53'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n53.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n53.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21483,8 +21483,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n54'(suite) -> [];
 'ibm-not-wf-P87-ibm87n54'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n54.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n54.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21496,8 +21496,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n55'(suite) -> [];
 'ibm-not-wf-P87-ibm87n55'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n55.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n55.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21509,8 +21509,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n56'(suite) -> [];
 'ibm-not-wf-P87-ibm87n56'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n56.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n56.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21522,8 +21522,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n57'(suite) -> [];
 'ibm-not-wf-P87-ibm87n57'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n57.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n57.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21535,8 +21535,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n58'(suite) -> [];
 'ibm-not-wf-P87-ibm87n58'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n58.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n58.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21548,8 +21548,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n59'(suite) -> [];
 'ibm-not-wf-P87-ibm87n59'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n59.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n59.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21561,8 +21561,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n60'(suite) -> [];
 'ibm-not-wf-P87-ibm87n60'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n60.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n60.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21574,8 +21574,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n61'(suite) -> [];
 'ibm-not-wf-P87-ibm87n61'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n61.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n61.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21587,8 +21587,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n62'(suite) -> [];
 'ibm-not-wf-P87-ibm87n62'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n62.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n62.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21600,8 +21600,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n63'(suite) -> [];
 'ibm-not-wf-P87-ibm87n63'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n63.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n63.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21613,8 +21613,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n64'(suite) -> [];
 'ibm-not-wf-P87-ibm87n64'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n64.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n64.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21626,8 +21626,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n66'(suite) -> [];
 'ibm-not-wf-P87-ibm87n66'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n66.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n66.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21639,8 +21639,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n67'(suite) -> [];
 'ibm-not-wf-P87-ibm87n67'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n67.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n67.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21652,8 +21652,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n68'(suite) -> [];
 'ibm-not-wf-P87-ibm87n68'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n68.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n68.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21665,8 +21665,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n69'(suite) -> [];
 'ibm-not-wf-P87-ibm87n69'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n69.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n69.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21678,8 +21678,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n70'(suite) -> [];
 'ibm-not-wf-P87-ibm87n70'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n70.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n70.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21691,8 +21691,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n71'(suite) -> [];
 'ibm-not-wf-P87-ibm87n71'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n71.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n71.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21704,8 +21704,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n72'(suite) -> [];
 'ibm-not-wf-P87-ibm87n72'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n72.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n72.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21717,8 +21717,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n73'(suite) -> [];
 'ibm-not-wf-P87-ibm87n73'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n73.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n73.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21730,8 +21730,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n74'(suite) -> [];
 'ibm-not-wf-P87-ibm87n74'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n74.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n74.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21743,8 +21743,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n75'(suite) -> [];
 'ibm-not-wf-P87-ibm87n75'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n75.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n75.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21756,8 +21756,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n76'(suite) -> [];
 'ibm-not-wf-P87-ibm87n76'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n76.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n76.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21769,8 +21769,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n77'(suite) -> [];
 'ibm-not-wf-P87-ibm87n77'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n77.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n77.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21782,8 +21782,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n78'(suite) -> [];
 'ibm-not-wf-P87-ibm87n78'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n78.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n78.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21795,8 +21795,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n79'(suite) -> [];
 'ibm-not-wf-P87-ibm87n79'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n79.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n79.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21808,8 +21808,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n80'(suite) -> [];
 'ibm-not-wf-P87-ibm87n80'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n80.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n80.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21821,8 +21821,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n81'(suite) -> [];
 'ibm-not-wf-P87-ibm87n81'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n81.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n81.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21834,8 +21834,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n82'(suite) -> [];
 'ibm-not-wf-P87-ibm87n82'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n82.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n82.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21847,8 +21847,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n83'(suite) -> [];
 'ibm-not-wf-P87-ibm87n83'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n83.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n83.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21860,8 +21860,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n84'(suite) -> [];
 'ibm-not-wf-P87-ibm87n84'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n84.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n84.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21873,8 +21873,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P87-ibm87n85'(suite) -> [];
 'ibm-not-wf-P87-ibm87n85'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P87/ibm87n85.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P87/ibm87n85.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21891,8 +21891,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P88-ibm88n01'(suite) -> [];
 'ibm-not-wf-P88-ibm88n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P88/ibm88n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21904,8 +21904,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P88-ibm88n02'(suite) -> [];
 'ibm-not-wf-P88-ibm88n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P88/ibm88n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21917,8 +21917,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P88-ibm88n03'(suite) -> [];
 'ibm-not-wf-P88-ibm88n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P88/ibm88n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21930,8 +21930,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P88-ibm88n04'(suite) -> [];
 'ibm-not-wf-P88-ibm88n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P88/ibm88n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21943,8 +21943,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P88-ibm88n05'(suite) -> [];
 'ibm-not-wf-P88-ibm88n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P88/ibm88n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21956,8 +21956,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P88-ibm88n06'(suite) -> [];
 'ibm-not-wf-P88-ibm88n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P88/ibm88n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21969,8 +21969,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P88-ibm88n08'(suite) -> [];
 'ibm-not-wf-P88-ibm88n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P88/ibm88n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21982,8 +21982,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P88-ibm88n09'(suite) -> [];
 'ibm-not-wf-P88-ibm88n09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P88/ibm88n09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -21995,8 +21995,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P88-ibm88n10'(suite) -> [];
 'ibm-not-wf-P88-ibm88n10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P88/ibm88n10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22008,8 +22008,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P88-ibm88n11'(suite) -> [];
 'ibm-not-wf-P88-ibm88n11'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P88/ibm88n11.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n11.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22021,8 +22021,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P88-ibm88n12'(suite) -> [];
 'ibm-not-wf-P88-ibm88n12'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P88/ibm88n12.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n12.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22034,8 +22034,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P88-ibm88n13'(suite) -> [];
 'ibm-not-wf-P88-ibm88n13'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P88/ibm88n13.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n13.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22047,8 +22047,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P88-ibm88n14'(suite) -> [];
 'ibm-not-wf-P88-ibm88n14'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P88/ibm88n14.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n14.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22060,8 +22060,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P88-ibm88n15'(suite) -> [];
 'ibm-not-wf-P88-ibm88n15'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P88/ibm88n15.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n15.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22073,8 +22073,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P88-ibm88n16'(suite) -> [];
 'ibm-not-wf-P88-ibm88n16'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P88/ibm88n16.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P88/ibm88n16.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22091,8 +22091,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P89-ibm89n01'(suite) -> [];
 'ibm-not-wf-P89-ibm89n01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P89/ibm89n01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22104,8 +22104,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P89-ibm89n02'(suite) -> [];
 'ibm-not-wf-P89-ibm89n02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P89/ibm89n02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22117,8 +22117,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P89-ibm89n03'(suite) -> [];
 'ibm-not-wf-P89-ibm89n03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P89/ibm89n03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22130,8 +22130,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P89-ibm89n04'(suite) -> [];
 'ibm-not-wf-P89-ibm89n04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P89/ibm89n04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22143,8 +22143,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P89-ibm89n05'(suite) -> [];
 'ibm-not-wf-P89-ibm89n05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P89/ibm89n05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22156,8 +22156,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P89-ibm89n06'(suite) -> [];
 'ibm-not-wf-P89-ibm89n06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P89/ibm89n06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22169,8 +22169,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P89-ibm89n07'(suite) -> [];
 'ibm-not-wf-P89-ibm89n07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P89/ibm89n07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22182,8 +22182,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P89-ibm89n08'(suite) -> [];
 'ibm-not-wf-P89-ibm89n08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P89/ibm89n08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22195,8 +22195,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P89-ibm89n09'(suite) -> [];
 'ibm-not-wf-P89-ibm89n09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P89/ibm89n09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22208,8 +22208,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P89-ibm89n10'(suite) -> [];
 'ibm-not-wf-P89-ibm89n10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P89/ibm89n10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22221,8 +22221,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P89-ibm89n11'(suite) -> [];
 'ibm-not-wf-P89-ibm89n11'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P89/ibm89n11.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n11.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22234,8 +22234,8 @@ testcases68(suite) -> [].
 %% Sections: B.
 'ibm-not-wf-P89-ibm89n12'(suite) -> [];
 'ibm-not-wf-P89-ibm89n12'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","not-wf/P89/ibm89n12.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P89/ibm89n12.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "not-wf").
 
@@ -22257,8 +22257,8 @@ testcases68(suite) -> [].
 %% Sections: 2.1
 'ibm-valid-P01-ibm01v01'(suite) -> [];
 'ibm-valid-P01-ibm01v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P01/ibm01v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P01/ibm01v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22275,8 +22275,8 @@ testcases68(suite) -> [].
 %% Sections: 2.2
 'ibm-valid-P02-ibm02v01'(suite) -> [];
 'ibm-valid-P02-ibm02v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P02/ibm02v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P02/ibm02v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22293,8 +22293,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P03-ibm03v01'(suite) -> [];
 'ibm-valid-P03-ibm03v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P03/ibm03v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P03/ibm03v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22311,8 +22311,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P09-ibm09v01'(suite) -> [];
 'ibm-valid-P09-ibm09v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P09/ibm09v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P09/ibm09v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22324,8 +22324,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P09-ibm09v02'(suite) -> [];
 'ibm-valid-P09-ibm09v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P09/ibm09v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P09/ibm09v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22337,8 +22337,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P09-ibm09v03'(suite) -> [];
 'ibm-valid-P09-ibm09v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P09/ibm09v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P09/ibm09v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22350,8 +22350,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P09-ibm09v04'(suite) -> [];
 'ibm-valid-P09-ibm09v04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P09/ibm09v04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P09/ibm09v04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22363,8 +22363,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P09-ibm09v05'(suite) -> [];
 'ibm-valid-P09-ibm09v05'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P09/ibm09v05.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P09/ibm09v05.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -22381,8 +22381,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P10-ibm10v01'(suite) -> [];
 'ibm-valid-P10-ibm10v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P10/ibm10v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22394,8 +22394,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P10-ibm10v02'(suite) -> [];
 'ibm-valid-P10-ibm10v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P10/ibm10v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22407,8 +22407,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P10-ibm10v03'(suite) -> [];
 'ibm-valid-P10-ibm10v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P10/ibm10v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22420,8 +22420,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P10-ibm10v04'(suite) -> [];
 'ibm-valid-P10-ibm10v04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P10/ibm10v04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22433,8 +22433,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P10-ibm10v05'(suite) -> [];
 'ibm-valid-P10-ibm10v05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P10/ibm10v05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22446,8 +22446,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P10-ibm10v06'(suite) -> [];
 'ibm-valid-P10-ibm10v06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P10/ibm10v06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22459,8 +22459,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P10-ibm10v07'(suite) -> [];
 'ibm-valid-P10-ibm10v07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P10/ibm10v07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22472,8 +22472,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P10-ibm10v08'(suite) -> [];
 'ibm-valid-P10-ibm10v08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P10/ibm10v08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P10/ibm10v08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22490,8 +22490,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P11-ibm11v01'(suite) -> [];
 'ibm-valid-P11-ibm11v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P11/ibm11v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P11/ibm11v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22503,8 +22503,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P11-ibm11v02'(suite) -> [];
 'ibm-valid-P11-ibm11v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P11/ibm11v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P11/ibm11v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22516,8 +22516,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P11-ibm11v03'(suite) -> [];
 'ibm-valid-P11-ibm11v03'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P11/ibm11v03.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P11/ibm11v03.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -22529,8 +22529,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P11-ibm11v04'(suite) -> [];
 'ibm-valid-P11-ibm11v04'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P11/ibm11v04.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P11/ibm11v04.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -22547,8 +22547,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P12-ibm12v01'(suite) -> [];
 'ibm-valid-P12-ibm12v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P12/ibm12v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P12/ibm12v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22560,8 +22560,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P12-ibm12v02'(suite) -> [];
 'ibm-valid-P12-ibm12v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P12/ibm12v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P12/ibm12v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22573,8 +22573,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P12-ibm12v03'(suite) -> [];
 'ibm-valid-P12-ibm12v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P12/ibm12v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P12/ibm12v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22586,8 +22586,8 @@ testcases68(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P12-ibm12v04'(suite) -> [];
 'ibm-valid-P12-ibm12v04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P12/ibm12v04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P12/ibm12v04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22606,8 +22606,8 @@ testcases111(suite) -> [].
 %% Sections: 2.3
 'ibm-valid-P13-ibm13v01'(suite) -> [];
 'ibm-valid-P13-ibm13v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P13/ibm13v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P13/ibm13v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22626,8 +22626,8 @@ testcases112(suite) -> [].
 %% Sections: 2.4
 'ibm-valid-P14-ibm14v01'(suite) -> [];
 'ibm-valid-P14-ibm14v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P14/ibm14v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P14/ibm14v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22639,8 +22639,8 @@ testcases112(suite) -> [].
 %% Sections: 2.4
 'ibm-valid-P14-ibm14v02'(suite) -> [];
 'ibm-valid-P14-ibm14v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P14/ibm14v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P14/ibm14v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22652,8 +22652,8 @@ testcases112(suite) -> [].
 %% Sections: 2.4
 'ibm-valid-P14-ibm14v03'(suite) -> [];
 'ibm-valid-P14-ibm14v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P14/ibm14v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P14/ibm14v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22670,8 +22670,8 @@ testcases112(suite) -> [].
 %% Sections: 2.5
 'ibm-valid-P15-ibm15v01'(suite) -> [];
 'ibm-valid-P15-ibm15v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P15/ibm15v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P15/ibm15v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22683,8 +22683,8 @@ testcases112(suite) -> [].
 %% Sections: 2.5
 'ibm-valid-P15-ibm15v02'(suite) -> [];
 'ibm-valid-P15-ibm15v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P15/ibm15v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P15/ibm15v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22696,8 +22696,8 @@ testcases112(suite) -> [].
 %% Sections: 2.5
 'ibm-valid-P15-ibm15v03'(suite) -> [];
 'ibm-valid-P15-ibm15v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P15/ibm15v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P15/ibm15v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22709,8 +22709,8 @@ testcases112(suite) -> [].
 %% Sections: 2.5
 'ibm-valid-P15-ibm15v04'(suite) -> [];
 'ibm-valid-P15-ibm15v04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P15/ibm15v04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P15/ibm15v04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22727,8 +22727,8 @@ testcases112(suite) -> [].
 %% Sections: 2.6
 'ibm-valid-P16-ibm16v01'(suite) -> [];
 'ibm-valid-P16-ibm16v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P16/ibm16v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P16/ibm16v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22740,8 +22740,8 @@ testcases112(suite) -> [].
 %% Sections: 2.6
 'ibm-valid-P16-ibm16v02'(suite) -> [];
 'ibm-valid-P16-ibm16v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P16/ibm16v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P16/ibm16v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22753,8 +22753,8 @@ testcases112(suite) -> [].
 %% Sections: 2.6
 'ibm-valid-P16-ibm16v03'(suite) -> [];
 'ibm-valid-P16-ibm16v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P16/ibm16v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P16/ibm16v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22771,8 +22771,8 @@ testcases112(suite) -> [].
 %% Sections: 2.6
 'ibm-valid-P17-ibm17v01'(suite) -> [];
 'ibm-valid-P17-ibm17v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P17/ibm17v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P17/ibm17v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22789,8 +22789,8 @@ testcases112(suite) -> [].
 %% Sections: 2.7
 'ibm-valid-P18-ibm18v01'(suite) -> [];
 'ibm-valid-P18-ibm18v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P18/ibm18v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P18/ibm18v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22807,8 +22807,8 @@ testcases112(suite) -> [].
 %% Sections: 2.7
 'ibm-valid-P19-ibm19v01'(suite) -> [];
 'ibm-valid-P19-ibm19v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P19/ibm19v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P19/ibm19v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22825,8 +22825,8 @@ testcases112(suite) -> [].
 %% Sections: 2.7
 'ibm-valid-P20-ibm20v01'(suite) -> [];
 'ibm-valid-P20-ibm20v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P20/ibm20v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P20/ibm20v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22838,8 +22838,8 @@ testcases112(suite) -> [].
 %% Sections: 2.7
 'ibm-valid-P20-ibm20v02'(suite) -> [];
 'ibm-valid-P20-ibm20v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P20/ibm20v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P20/ibm20v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22856,8 +22856,8 @@ testcases112(suite) -> [].
 %% Sections: 2.7
 'ibm-valid-P21-ibm21v01'(suite) -> [];
 'ibm-valid-P21-ibm21v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P21/ibm21v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P21/ibm21v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22874,8 +22874,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P22-ibm22v01'(suite) -> [];
 'ibm-valid-P22-ibm22v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P22/ibm22v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P22/ibm22v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22887,8 +22887,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P22-ibm22v02'(suite) -> [];
 'ibm-valid-P22-ibm22v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P22/ibm22v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P22/ibm22v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22900,8 +22900,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P22-ibm22v03'(suite) -> [];
 'ibm-valid-P22-ibm22v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P22/ibm22v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P22/ibm22v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22913,8 +22913,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P22-ibm22v04'(suite) -> [];
 'ibm-valid-P22-ibm22v04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P22/ibm22v04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P22/ibm22v04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22926,8 +22926,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P22-ibm22v05'(suite) -> [];
 'ibm-valid-P22-ibm22v05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P22/ibm22v05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P22/ibm22v05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22939,8 +22939,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P22-ibm22v06'(suite) -> [];
 'ibm-valid-P22-ibm22v06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P22/ibm22v06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P22/ibm22v06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22952,8 +22952,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P22-ibm22v07'(suite) -> [];
 'ibm-valid-P22-ibm22v07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P22/ibm22v07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P22/ibm22v07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22970,8 +22970,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P23-ibm23v01'(suite) -> [];
 'ibm-valid-P23-ibm23v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P23/ibm23v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P23/ibm23v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22983,8 +22983,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P23-ibm23v02'(suite) -> [];
 'ibm-valid-P23-ibm23v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P23/ibm23v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P23/ibm23v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -22996,8 +22996,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P23-ibm23v03'(suite) -> [];
 'ibm-valid-P23-ibm23v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P23/ibm23v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P23/ibm23v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23009,8 +23009,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P23-ibm23v04'(suite) -> [];
 'ibm-valid-P23-ibm23v04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P23/ibm23v04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P23/ibm23v04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23022,8 +23022,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P23-ibm23v05'(suite) -> [];
 'ibm-valid-P23-ibm23v05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P23/ibm23v05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P23/ibm23v05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23035,8 +23035,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P23-ibm23v06'(suite) -> [];
 'ibm-valid-P23-ibm23v06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P23/ibm23v06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P23/ibm23v06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23053,8 +23053,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P24-ibm24v01'(suite) -> [];
 'ibm-valid-P24-ibm24v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P24/ibm24v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P24/ibm24v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23066,8 +23066,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P24-ibm24v02'(suite) -> [];
 'ibm-valid-P24-ibm24v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P24/ibm24v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P24/ibm24v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23084,8 +23084,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P25-ibm25v01'(suite) -> [];
 'ibm-valid-P25-ibm25v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P25/ibm25v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P25/ibm25v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23097,8 +23097,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P25-ibm25v02'(suite) -> [];
 'ibm-valid-P25-ibm25v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P25/ibm25v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P25/ibm25v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23110,8 +23110,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P25-ibm25v03'(suite) -> [];
 'ibm-valid-P25-ibm25v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P25/ibm25v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P25/ibm25v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23123,8 +23123,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P25-ibm25v04'(suite) -> [];
 'ibm-valid-P25-ibm25v04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P25/ibm25v04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P25/ibm25v04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23141,8 +23141,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P26-ibm26v01'(suite) -> [];
 'ibm-valid-P26-ibm26v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P26/ibm26v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P26/ibm26v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23159,8 +23159,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P27-ibm27v01'(suite) -> [];
 'ibm-valid-P27-ibm27v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P27/ibm27v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P27/ibm27v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23172,8 +23172,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P27-ibm27v02'(suite) -> [];
 'ibm-valid-P27-ibm27v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P27/ibm27v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P27/ibm27v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23185,8 +23185,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P27-ibm27v03'(suite) -> [];
 'ibm-valid-P27-ibm27v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P27/ibm27v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P27/ibm27v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23203,8 +23203,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P28-ibm28v01'(suite) -> [];
 'ibm-valid-P28-ibm28v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P28/ibm28v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P28/ibm28v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23216,8 +23216,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P28-ibm28v02'(suite) -> [];
 'ibm-valid-P28-ibm28v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P28/ibm28v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P28/ibm28v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23234,8 +23234,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P29-ibm29v01'(suite) -> [];
 'ibm-valid-P29-ibm29v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P29/ibm29v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P29/ibm29v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23247,8 +23247,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P29-ibm29v02'(suite) -> [];
 'ibm-valid-P29-ibm29v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P29/ibm29v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P29/ibm29v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23265,8 +23265,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P30-ibm30v01'(suite) -> [];
 'ibm-valid-P30-ibm30v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P30/ibm30v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P30/ibm30v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23278,8 +23278,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P30-ibm30v02'(suite) -> [];
 'ibm-valid-P30-ibm30v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P30/ibm30v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P30/ibm30v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23296,8 +23296,8 @@ testcases112(suite) -> [].
 %% Sections: 2.8
 'ibm-valid-P31-ibm31v01'(suite) -> [];
 'ibm-valid-P31-ibm31v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P31/ibm31v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P31/ibm31v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23316,8 +23316,8 @@ testcases130(suite) -> [].
 %% Sections: 2.9
 'ibm-valid-P32-ibm32v01'(suite) -> [];
 'ibm-valid-P32-ibm32v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P32/ibm32v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P32/ibm32v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23329,8 +23329,8 @@ testcases130(suite) -> [].
 %% Sections: 2.9
 'ibm-valid-P32-ibm32v02'(suite) -> [];
 'ibm-valid-P32-ibm32v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P32/ibm32v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P32/ibm32v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23342,8 +23342,8 @@ testcases130(suite) -> [].
 %% Sections: 2.9
 'ibm-valid-P32-ibm32v03'(suite) -> [];
 'ibm-valid-P32-ibm32v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P32/ibm32v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P32/ibm32v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23355,8 +23355,8 @@ testcases130(suite) -> [].
 %% Sections: 2.9
 'ibm-valid-P32-ibm32v04'(suite) -> [];
 'ibm-valid-P32-ibm32v04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P32/ibm32v04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P32/ibm32v04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23373,8 +23373,8 @@ testcases130(suite) -> [].
 %% Sections: 2.12
 'ibm-valid-P33-ibm33v01'(suite) -> [];
 'ibm-valid-P33-ibm33v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P33/ibm33v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P33/ibm33v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23391,8 +23391,8 @@ testcases130(suite) -> [].
 %% Sections: 2.12
 'ibm-valid-P34-ibm34v01'(suite) -> [];
 'ibm-valid-P34-ibm34v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P34/ibm34v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P34/ibm34v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23409,8 +23409,8 @@ testcases130(suite) -> [].
 %% Sections: 2.12
 'ibm-valid-P35-ibm35v01'(suite) -> [];
 'ibm-valid-P35-ibm35v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P35/ibm35v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P35/ibm35v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23427,8 +23427,8 @@ testcases130(suite) -> [].
 %% Sections: 2.12
 'ibm-valid-P36-ibm36v01'(suite) -> [];
 'ibm-valid-P36-ibm36v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P36/ibm36v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P36/ibm36v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23445,8 +23445,8 @@ testcases130(suite) -> [].
 %% Sections: 2.12
 'ibm-valid-P37-ibm37v01'(suite) -> [];
 'ibm-valid-P37-ibm37v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P37/ibm37v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P37/ibm37v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23463,8 +23463,8 @@ testcases130(suite) -> [].
 %% Sections: 2.12
 'ibm-valid-P38-ibm38v01'(suite) -> [];
 'ibm-valid-P38-ibm38v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P38/ibm38v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P38/ibm38v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23481,8 +23481,8 @@ testcases130(suite) -> [].
 %% Sections: 3
 'ibm-valid-P39-ibm39v01'(suite) -> [];
 'ibm-valid-P39-ibm39v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P39/ibm39v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P39/ibm39v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23499,8 +23499,8 @@ testcases130(suite) -> [].
 %% Sections: 3.1
 'ibm-valid-P40-ibm40v01'(suite) -> [];
 'ibm-valid-P40-ibm40v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P40/ibm40v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P40/ibm40v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23517,8 +23517,8 @@ testcases130(suite) -> [].
 %% Sections: 3.1
 'ibm-valid-P41-ibm41v01'(suite) -> [];
 'ibm-valid-P41-ibm41v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P41/ibm41v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P41/ibm41v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23535,8 +23535,8 @@ testcases130(suite) -> [].
 %% Sections: 3.1
 'ibm-valid-P42-ibm42v01'(suite) -> [];
 'ibm-valid-P42-ibm42v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P42/ibm42v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P42/ibm42v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23553,8 +23553,8 @@ testcases130(suite) -> [].
 %% Sections: 3.1
 'ibm-valid-P43-ibm43v01'(suite) -> [];
 'ibm-valid-P43-ibm43v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P43/ibm43v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P43/ibm43v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23571,8 +23571,8 @@ testcases130(suite) -> [].
 %% Sections: 3.1
 'ibm-valid-P44-ibm44v01'(suite) -> [];
 'ibm-valid-P44-ibm44v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P44/ibm44v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P44/ibm44v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23589,8 +23589,8 @@ testcases130(suite) -> [].
 %% Sections: 3.2
 'ibm-valid-P45-ibm45v01'(suite) -> [];
 'ibm-valid-P45-ibm45v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P45/ibm45v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P45/ibm45v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23607,8 +23607,8 @@ testcases130(suite) -> [].
 %% Sections: 3.2.1
 'ibm-valid-P47-ibm47v01'(suite) -> [];
 'ibm-valid-P47-ibm47v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P47/ibm47v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P47/ibm47v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23625,8 +23625,8 @@ testcases130(suite) -> [].
 %% Sections: 3.2.1
 'ibm-valid-P49-ibm49v01'(suite) -> [];
 'ibm-valid-P49-ibm49v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P49/ibm49v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P49/ibm49v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23643,8 +23643,8 @@ testcases130(suite) -> [].
 %% Sections: 3.2.1
 'ibm-valid-P50-ibm50v01'(suite) -> [];
 'ibm-valid-P50-ibm50v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P50/ibm50v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P50/ibm50v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23661,8 +23661,8 @@ testcases130(suite) -> [].
 %% Sections: 3.2.2
 'ibm-valid-P51-ibm51v01'(suite) -> [];
 'ibm-valid-P51-ibm51v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P51/ibm51v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P51/ibm51v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23674,8 +23674,8 @@ testcases130(suite) -> [].
 %% Sections: 3.2.2
 'ibm-valid-P51-ibm51v02'(suite) -> [];
 'ibm-valid-P51-ibm51v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P51/ibm51v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P51/ibm51v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23692,8 +23692,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3
 'ibm-valid-P52-ibm52v01'(suite) -> [];
 'ibm-valid-P52-ibm52v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P52/ibm52v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P52/ibm52v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23710,8 +23710,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P54-ibm54v01'(suite) -> [];
 'ibm-valid-P54-ibm54v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P54/ibm54v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P54/ibm54v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23723,8 +23723,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P54-ibm54v02'(suite) -> [];
 'ibm-valid-P54-ibm54v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P54/ibm54v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P54/ibm54v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23736,8 +23736,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P54-ibm54v03'(suite) -> [];
 'ibm-valid-P54-ibm54v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P54/ibm54v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P54/ibm54v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23754,8 +23754,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P55-ibm55v01'(suite) -> [];
 'ibm-valid-P55-ibm55v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P55/ibm55v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P55/ibm55v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23772,8 +23772,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P56-ibm56v01'(suite) -> [];
 'ibm-valid-P56-ibm56v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P56/ibm56v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23785,8 +23785,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P56-ibm56v02'(suite) -> [];
 'ibm-valid-P56-ibm56v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P56/ibm56v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23798,8 +23798,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P56-ibm56v03'(suite) -> [];
 'ibm-valid-P56-ibm56v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P56/ibm56v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23811,8 +23811,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P56-ibm56v04'(suite) -> [];
 'ibm-valid-P56-ibm56v04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P56/ibm56v04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23824,8 +23824,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P56-ibm56v05'(suite) -> [];
 'ibm-valid-P56-ibm56v05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P56/ibm56v05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23837,8 +23837,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P56-ibm56v06'(suite) -> [];
 'ibm-valid-P56-ibm56v06'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P56/ibm56v06.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v06.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23850,8 +23850,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P56-ibm56v07'(suite) -> [];
 'ibm-valid-P56-ibm56v07'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P56/ibm56v07.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v07.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23863,8 +23863,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P56-ibm56v08'(suite) -> [];
 'ibm-valid-P56-ibm56v08'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P56/ibm56v08.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v08.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23876,8 +23876,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P56-ibm56v09'(suite) -> [];
 'ibm-valid-P56-ibm56v09'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P56/ibm56v09.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v09.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23889,8 +23889,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P56-ibm56v10'(suite) -> [];
 'ibm-valid-P56-ibm56v10'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P56/ibm56v10.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P56/ibm56v10.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23907,8 +23907,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P57-ibm57v01'(suite) -> [];
 'ibm-valid-P57-ibm57v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P57/ibm57v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P57/ibm57v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23925,8 +23925,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P58-ibm58v01'(suite) -> [];
 'ibm-valid-P58-ibm58v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P58/ibm58v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P58/ibm58v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23938,8 +23938,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P58-ibm58v02'(suite) -> [];
 'ibm-valid-P58-ibm58v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P58/ibm58v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P58/ibm58v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23956,8 +23956,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P59-ibm59v01'(suite) -> [];
 'ibm-valid-P59-ibm59v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P59/ibm59v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P59/ibm59v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23969,8 +23969,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.1
 'ibm-valid-P59-ibm59v02'(suite) -> [];
 'ibm-valid-P59-ibm59v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P59/ibm59v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P59/ibm59v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -23987,8 +23987,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.2
 'ibm-valid-P60-ibm60v01'(suite) -> [];
 'ibm-valid-P60-ibm60v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P60/ibm60v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P60/ibm60v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24000,8 +24000,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.2
 'ibm-valid-P60-ibm60v02'(suite) -> [];
 'ibm-valid-P60-ibm60v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P60/ibm60v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P60/ibm60v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24013,8 +24013,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.2
 'ibm-valid-P60-ibm60v03'(suite) -> [];
 'ibm-valid-P60-ibm60v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P60/ibm60v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P60/ibm60v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24026,8 +24026,8 @@ testcases130(suite) -> [].
 %% Sections: 3.3.2
 'ibm-valid-P60-ibm60v04'(suite) -> [];
 'ibm-valid-P60-ibm60v04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P60/ibm60v04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P60/ibm60v04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24044,8 +24044,8 @@ testcases130(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P61-ibm61v01'(suite) -> [];
 'ibm-valid-P61-ibm61v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P61/ibm61v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P61/ibm61v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24057,8 +24057,8 @@ testcases130(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P61-ibm61v02'(suite) -> [];
 'ibm-valid-P61-ibm61v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P61/ibm61v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P61/ibm61v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24077,8 +24077,8 @@ testcases157(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P62-ibm62v01'(suite) -> [];
 'ibm-valid-P62-ibm62v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P62/ibm62v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P62/ibm62v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24090,8 +24090,8 @@ testcases157(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P62-ibm62v02'(suite) -> [];
 'ibm-valid-P62-ibm62v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P62/ibm62v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P62/ibm62v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24103,8 +24103,8 @@ testcases157(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P62-ibm62v03'(suite) -> [];
 'ibm-valid-P62-ibm62v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P62/ibm62v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P62/ibm62v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24116,8 +24116,8 @@ testcases157(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P62-ibm62v04'(suite) -> [];
 'ibm-valid-P62-ibm62v04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P62/ibm62v04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P62/ibm62v04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24129,8 +24129,8 @@ testcases157(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P62-ibm62v05'(suite) -> [];
 'ibm-valid-P62-ibm62v05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P62/ibm62v05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P62/ibm62v05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24149,8 +24149,8 @@ testcases158(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P63-ibm63v01'(suite) -> [];
 'ibm-valid-P63-ibm63v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P63/ibm63v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P63/ibm63v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24162,8 +24162,8 @@ testcases158(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P63-ibm63v02'(suite) -> [];
 'ibm-valid-P63-ibm63v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P63/ibm63v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P63/ibm63v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24175,8 +24175,8 @@ testcases158(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P63-ibm63v03'(suite) -> [];
 'ibm-valid-P63-ibm63v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P63/ibm63v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P63/ibm63v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24188,8 +24188,8 @@ testcases158(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P63-ibm63v04'(suite) -> [];
 'ibm-valid-P63-ibm63v04'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P63/ibm63v04.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P63/ibm63v04.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24201,8 +24201,8 @@ testcases158(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P63-ibm63v05'(suite) -> [];
 'ibm-valid-P63-ibm63v05'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P63/ibm63v05.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P63/ibm63v05.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24221,8 +24221,8 @@ testcases159(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P64-ibm64v01'(suite) -> [];
 'ibm-valid-P64-ibm64v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P64/ibm64v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P64/ibm64v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24234,8 +24234,8 @@ testcases159(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P64-ibm64v02'(suite) -> [];
 'ibm-valid-P64-ibm64v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P64/ibm64v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P64/ibm64v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24247,8 +24247,8 @@ testcases159(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P64-ibm64v03'(suite) -> [];
 'ibm-valid-P64-ibm64v03'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P64/ibm64v03.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P64/ibm64v03.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24267,8 +24267,8 @@ testcases160(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P65-ibm65v01'(suite) -> [];
 'ibm-valid-P65-ibm65v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P65/ibm65v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P65/ibm65v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24280,8 +24280,8 @@ testcases160(suite) -> [].
 %% Sections: 3.4
 'ibm-valid-P65-ibm65v02'(suite) -> [];
 'ibm-valid-P65-ibm65v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P65/ibm65v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P65/ibm65v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24300,8 +24300,8 @@ testcases161(suite) -> [].
 %% Sections: 4.1
 'ibm-valid-P66-ibm66v01'(suite) -> [];
 'ibm-valid-P66-ibm66v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P66/ibm66v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P66/ibm66v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24318,8 +24318,8 @@ testcases161(suite) -> [].
 %% Sections: 4.1
 'ibm-valid-P67-ibm67v01'(suite) -> [];
 'ibm-valid-P67-ibm67v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P67/ibm67v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P67/ibm67v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24336,8 +24336,8 @@ testcases161(suite) -> [].
 %% Sections: 4.1
 'ibm-valid-P68-ibm68v01'(suite) -> [];
 'ibm-valid-P68-ibm68v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P68/ibm68v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P68/ibm68v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24349,8 +24349,8 @@ testcases161(suite) -> [].
 %% Sections: 4.1
 'ibm-valid-P68-ibm68v02'(suite) -> [];
 'ibm-valid-P68-ibm68v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P68/ibm68v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P68/ibm68v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24367,8 +24367,8 @@ testcases161(suite) -> [].
 %% Sections: 4.1
 'ibm-valid-P69-ibm69v01'(suite) -> [];
 'ibm-valid-P69-ibm69v01'(_Config) -> {skip, "NYI"}.
-%%    ?line file:set_cwd(?config(data_dir,Config)),
-%%    ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P69/ibm69v01.xml"]),
+%%    ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+%%    ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P69/ibm69v01.xml"]),
 %%    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
 %%    ?line check_result(R, "valid").
 
@@ -24380,8 +24380,8 @@ testcases161(suite) -> [].
 %% Sections: 4.1
 'ibm-valid-P69-ibm69v02'(suite) -> [];
 'ibm-valid-P69-ibm69v02'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P69/ibm69v02.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P69/ibm69v02.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24398,8 +24398,8 @@ testcases161(suite) -> [].
 %% Sections: 4.2
 'ibm-valid-P70-ibm70v01'(suite) -> [];
 'ibm-valid-P70-ibm70v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P70/ibm70v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P70/ibm70v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24416,8 +24416,8 @@ testcases161(suite) -> [].
 %% Sections: 4.3.2
 'ibm-valid-P78-ibm78v01'(suite) -> [];
 'ibm-valid-P78-ibm78v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P78/ibm78v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P78/ibm78v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24436,8 +24436,8 @@ testcases167(suite) -> [].
 %% Sections: 4.3.2
 'ibm-valid-P79-ibm79v01'(suite) -> [];
 'ibm-valid-P79-ibm79v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P79/ibm79v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P79/ibm79v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24454,8 +24454,8 @@ testcases167(suite) -> [].
 %% Sections: 4.7
 'ibm-valid-P82-ibm82v01'(suite) -> [];
 'ibm-valid-P82-ibm82v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P82/ibm82v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P82/ibm82v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24472,8 +24472,8 @@ testcases167(suite) -> [].
 %% Sections: B.
 'ibm-valid-P85-ibm85v01'(suite) -> [];
 'ibm-valid-P85-ibm85v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P85/ibm85v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P85/ibm85v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24492,8 +24492,8 @@ testcases170(suite) -> [].
 %% Sections: B.
 'ibm-valid-P86-ibm86v01'(suite) -> [];
 'ibm-valid-P86-ibm86v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P86/ibm86v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P86/ibm86v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24510,8 +24510,8 @@ testcases170(suite) -> [].
 %% Sections: B.
 'ibm-valid-P87-ibm87v01'(suite) -> [];
 'ibm-valid-P87-ibm87v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P87/ibm87v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P87/ibm87v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24528,8 +24528,8 @@ testcases170(suite) -> [].
 %% Sections: B.
 'ibm-valid-P88-ibm88v01'(suite) -> [];
 'ibm-valid-P88-ibm88v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P88/ibm88v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P88/ibm88v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
@@ -24546,8 +24546,8 @@ testcases170(suite) -> [].
 %% Sections: B.
 'ibm-valid-P89-ibm89v01'(suite) -> [];
 'ibm-valid-P89-ibm89v01'(Config) -> 
-   ?line file:set_cwd(?config(data_dir,Config)),
-   ?line Path = filename:join([?config(data_dir,Config),"ibm","valid/P89/ibm89v01.xml"]),
+   ?line file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
+   ?line Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","valid/P89/ibm89v01.xml"]),
    ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
    ?line check_result(R, "valid").
 
diff --git a/lib/xmerl/test/xmerl_sax_std_SUITE_data/ibm.tgz b/lib/xmerl/test/xmerl_sax_std_SUITE_data/ibm.tgz
deleted file mode 100644
index 99e952fe81..0000000000
--- a/lib/xmerl/test/xmerl_sax_std_SUITE_data/ibm.tgz
+++ /dev/null
diff --git a/lib/xmerl/test/xmerl_sax_std_SUITE_data/japanese.tgz b/lib/xmerl/test/xmerl_sax_std_SUITE_data/japanese.tgz
deleted file mode 100644
index d082067a64..0000000000
--- a/lib/xmerl/test/xmerl_sax_std_SUITE_data/japanese.tgz
+++ /dev/null
diff --git a/lib/xmerl/test/xmerl_sax_std_SUITE_data/oasis.tgz b/lib/xmerl/test/xmerl_sax_std_SUITE_data/oasis.tgz
deleted file mode 100644
index d13e89b2f3..0000000000
--- a/lib/xmerl/test/xmerl_sax_std_SUITE_data/oasis.tgz
+++ /dev/null
diff --git a/lib/xmerl/test/xmerl_sax_std_SUITE_data/sun.tgz b/lib/xmerl/test/xmerl_sax_std_SUITE_data/sun.tgz
deleted file mode 100644
index 774b6e4117..0000000000
--- a/lib/xmerl/test/xmerl_sax_std_SUITE_data/sun.tgz
+++ /dev/null
diff --git a/lib/xmerl/test/xmerl_sax_std_SUITE_data/xmltest.tgz b/lib/xmerl/test/xmerl_sax_std_SUITE_data/xmltest.tgz
deleted file mode 100644
index f8ae27224b..0000000000
--- a/lib/xmerl/test/xmerl_sax_std_SUITE_data/xmltest.tgz
+++ /dev/null
diff --git a/lib/xmerl/test/xmerl_std_SUITE.erl b/lib/xmerl/test/xmerl_std_SUITE.erl
index 78d2823e86..c3cc9007d3 100644
--- a/lib/xmerl/test/xmerl_std_SUITE.erl
+++ b/lib/xmerl/test/xmerl_std_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -16,9 +16,7 @@
 %% 
 %% %CopyrightEnd%
 %%
-%%
-%%% Purpose : Test suite for the ASN.1 application
-
+%%----------------------------------------------------------------------
 -module(xmerl_std_SUITE).
 
 -compile(export_all).
@@ -761,11 +759,11 @@ init_per_suite(doc) ->
 init_per_suite(Config) ->
     Dog=test_server:timetrap({minutes,10}),
     ?line file:set_cwd(?config(data_dir,Config)),
-    ?line ok=erl_tar:extract("ibm.tar.gz",[compressed]),
-    ?line ok=erl_tar:extract("japanese.tar.gz",[compressed]),
-    ?line ok=erl_tar:extract("oasis.tar.gz",[compressed]),
-    ?line ok=erl_tar:extract("sun.tar.gz",[compressed]),
-    ?line ok=erl_tar:extract("xmltest.tar.gz",[compressed]),
+    ?line ok=erl_tar:extract("ibm.tgz",[compressed]),
+    ?line ok=erl_tar:extract("japanese.tgz",[compressed]),
+    ?line ok=erl_tar:extract("oasis.tgz",[compressed]),
+    ?line ok=erl_tar:extract("sun.tgz",[compressed]),
+    ?line ok=erl_tar:extract("xmltest.tgz",[compressed]),
     ?line ok = change_mode(["ibm","japanese","oasis",
 			    "sun","xmltest"]),
     [{watchdog, Dog}|Config].
diff --git a/lib/xmerl/test/xmerl_std_SUITE_data/ibm.tar.gz b/lib/xmerl/test/xmerl_std_SUITE_data/ibm.tgz
index c36bcb5bd3..c36bcb5bd3 100644
--- a/lib/xmerl/test/xmerl_std_SUITE_data/ibm.tar.gz
+++ b/lib/xmerl/test/xmerl_std_SUITE_data/ibm.tgz
diff --git a/lib/xmerl/test/xmerl_std_SUITE_data/japanese.tar.gz b/lib/xmerl/test/xmerl_std_SUITE_data/japanese.tgz
index cf1d71a2fd..cf1d71a2fd 100644
--- a/lib/xmerl/test/xmerl_std_SUITE_data/japanese.tar.gz
+++ b/lib/xmerl/test/xmerl_std_SUITE_data/japanese.tgz
diff --git a/lib/xmerl/test/xmerl_std_SUITE_data/oasis.tar.gz b/lib/xmerl/test/xmerl_std_SUITE_data/oasis.tgz
index ab809a63e7..ab809a63e7 100644
--- a/lib/xmerl/test/xmerl_std_SUITE_data/oasis.tar.gz
+++ b/lib/xmerl/test/xmerl_std_SUITE_data/oasis.tgz
diff --git a/lib/xmerl/test/xmerl_std_SUITE_data/sun.tar.gz b/lib/xmerl/test/xmerl_std_SUITE_data/sun.tgz
index 022e64ab9e..022e64ab9e 100644
--- a/lib/xmerl/test/xmerl_std_SUITE_data/sun.tar.gz
+++ b/lib/xmerl/test/xmerl_std_SUITE_data/sun.tgz
diff --git a/lib/xmerl/test/xmerl_std_SUITE_data/xmltest.tar.gz b/lib/xmerl/test/xmerl_std_SUITE_data/xmltest.tgz
index d49fe26ff0..d49fe26ff0 100644
--- a/lib/xmerl/test/xmerl_std_SUITE_data/xmltest.tar.gz
+++ b/lib/xmerl/test/xmerl_std_SUITE_data/xmltest.tgz
diff --git a/lib/xmerl/test/xmerl_test_lib.erl b/lib/xmerl/test/xmerl_test_lib.erl
index 7942224703..83ca5431fd 100644
--- a/lib/xmerl/test/xmerl_test_lib.erl
+++ b/lib/xmerl/test/xmerl_test_lib.erl
@@ -16,9 +16,8 @@
 %% 
 %% %CopyrightEnd%
 %%
-%%%%% Purpose : Test suite for the xmerl application, xmerl_eventp module
 %%%-------------------------------------------------------------------
-%%% File    : xmerl_sax_lib.erl
+%%% File    : xmerl_test_lib.erl
 %%% Author  : Bertil Karlsson <bertil@finrod>
 %%% Description : 
 %%%
@@ -28,152 +27,8 @@
 
 -compile(export_all).
 
--include("test_server.hrl").
--include("xmerl.hrl").
-
-sax_parse_export_xml_big(Config) ->
-    DataDir = ?config(data_dir,Config),
-    OutDir = ?config(priv_dir,Config),
-    io:format("DataDir: ~p~n,OutDir:~p~n",[DataDir,OutDir]),
-    CMOMxml = filename:join([DataDir,"eventp","CMOM.xml"]),
-    ?line {Ex,[]} = xmerl_eventp:file_sax(CMOMxml, xmerl_xml,[],[]),
-    OutFile = filename:join([OutDir,"cmom"]),
-    file:delete(OutFile),
-    StubFile = filename:join([DataDir,"eventp","CelloMOM.stub"]),
-    ?line {ok,Bin} = file:read_file(StubFile),
-    ?line {ok,IO} = file:open(OutFile,[write,append]),
-    ?line ok = file:write(IO,Bin),
-    ?line ok = io:format(IO,"~s~n~n",[lists:flatten(Ex)]),
-    Cmd = lists:flatten(io_lib:format("cmp ~s ~s",[OutFile,CMOMxml])),
-    ?line [] = os:cmd(Cmd),
-    ok.
-
-sax_parse_export_xml_small(Config) ->
-    DataDir = ?config(data_dir,Config),
-    OutDir = ?config(priv_dir,Config),
-    Wurfl_xml = filename:join([DataDir,"eventp","wurfl.xml"]),
-    ?line {Ex,[]} = xmerl_eventp:file_sax(Wurfl_xml, xmerl_xml,[],[]),
-    OutFile = filename:join([OutDir,"wrfl"]),
-    file:delete(OutFile),
-    StubFile = filename:join([DataDir,"eventp","wurfl.stub"]),
-    ?line {ok,Bin} = file:read_file(StubFile),
-    ?line {ok,IO} = file:open(OutFile,[write,append]),
-    ?line ok = file:write(IO,Bin),
-    ?line ok = io:format(IO,"~s~n",[lists:flatten(Ex)]),
-    Cmd = lists:flatten(io_lib:format("cmp ~s ~s",[OutFile,Wurfl_xml])),
-    ?line [] = os:cmd(Cmd),
-    ok.
-
-export_simple1(_Config) ->
-    Simple = simple(),
-    Res = xmerl:export_simple(Simple,xmerl_xml,[{title, "Doc Title"}]),
-    ?line "<?xml version="++_ = lists:flatten(Res),
-
-    %% Use of fun in simple content OTP-6679
-    Simple2 = simple2(),
-    Res2 = xmerl:export_simple(Simple2,xmerl_xml,[{title,"Doc Title"}]),
-    ?line true = (Res2 =:= Res),
-    ok.
-
-export(Config) ->
-    DataDir = ?config(data_dir,Config),
-    Prolog = ["<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<!DOCTYPE motorcycles SYSTEM \"motorcycles.dtd\">\n"],
-    TestFile = filename:join([DataDir,"misc","motorcycles.xml"]),
-    ?line {E,_} = xmerl_scan:file(TestFile),
-    ?line Exported = xmerl:export([E],xmerl_xml,[{prolog,Prolog}]),
-    B = list_to_binary(Exported++"\n"),
-    ?line {ok,B} = file:read_file(TestFile),
-    ok.
-
-
-simple() ->
-    [{document, 
-      [{title, "Doc Title"}, {author, "Ulf Wiger"}],
-      [{section, 
-	[{heading, "heading1"}],
-	[{'P', ["This is a paragraph of text."]},
-	 {section, 
-	  [{heading, "heading2"}],
-	  [{'P', ["This is another paragraph."]},
-	   {table, 
-	    [{border, 1}],
-	    [{heading,
-	      [{col, ["head1"]},
-	       {col, ["head2"]}]},
-	     {row,
-	      [{col, ["col11"]},
-	       {col, ["col12"]}]},
-	     {row,
-	      [{col, ["col21"]},
-	       {col, ["col22"]}]}]}]}]}]}].
-
-
-simple2() ->
-    GenC = fun ?MODULE:generate_section/1,
-    GenA = fun ?MODULE:generate_attr_title/1,
-    [{document,[{GenA,2}],[{GenC,1}]}].
-
-generate_attr_title(0) ->
-    done;
-generate_attr_title(1) ->
-    {{title,"Doc Title"},0};
-generate_attr_title(2) ->
-    {{author, "Ulf Wiger"},1}.
-generate_section(0) ->
-    done;
-generate_section(N) ->
-    GenC = fun ?MODULE:generate_section_content/1,
-    GenA = fun ?MODULE:generate_section_attribute/1,
-    {{section,[{GenA,1}],[{GenC,2}]},N-1}.
-
-generate_section_attribute(0) ->
-    done;
-generate_section_attribute(N) ->
-    {{heading, "heading1"},N-1}.
-
-    
-generate_subsection_content(0) ->
-    done;
-generate_subsection_content(1) ->
-    {{'P',["This is another paragraph."]},0};
-generate_subsection_content(N) ->
-    {{table,[{fun ?MODULE:generate_border_attribute/1,1}],
-      [{fun ?MODULE:generate_table_content/1,2}]},N-1}.
-generate_section_content(0) ->
-    done;
-generate_section_content(1) ->
-    {{'P',["This is a paragraph of text."]},0};
-generate_section_content(N) ->
-    {{section,[{heading,"heading2"}],
-      [{fun ?MODULE:generate_subsection_content/1,2}]},N-1}.
-generate_border_attribute(0) ->
-    done;
-generate_border_attribute(N) ->
-    {{border,N},N-1}.
-generate_table_content(0) ->
-    done;
-generate_table_content(1) ->
-    {{fun ?MODULE:generate_heading/1,1},0};
-generate_table_content(N) ->
-    {{fun ?MODULE:generate_row/1, {2,2}},N-1}.
-generate_row({0,_}) ->
-    done;
-generate_row(N) ->
-    UpdateS = fun({2,_}) -> {1,2};(_) -> {0,0} end,
-    {{row,[{fun ?MODULE:generate_row_col/1, N}]},UpdateS(N)}.
-generate_row_col({_,0}) ->
-    done;
-generate_row_col(N={C,R}) ->
-    UpdateS = fun({X,Y}) -> {X,Y-1} end,
-    {{col,[lists:concat(["col",C,R])]},UpdateS(N)}.
-generate_heading(0) ->
-    done;
-generate_heading(N) ->
-    {{heading,[{fun ?MODULE:generate_heading_col/1,2}]},N-1}.
-generate_heading_col(0) ->
-    done;
-generate_heading_col(N) ->
-    {{col,[lists:concat(["head",N])]},N-1}.
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
 
 %% cmp_element/2
 %% First argument result after parsing
@@ -226,118 +81,12 @@ keysearch_delete(Key,N,List) ->
 	    false
     end.
 
-%%-------------------------------------------------------
-%% TICKET tests
-%%-------------------------------------------------------
-
-%%
-%% ticket_5998
-%%
-%% A Kleene Closure child in a sequence consumed all following
-%% childs. This problem has been fixed.
-%%
-ticket_5998(Config) ->
-    DataDir = ?config(data_dir,Config),
-    %% First fix is tested by case syntax_bug2.
-    
-    ?line case catch xmerl_scan:file(filename:join([DataDir,misc,
-						    "ticket_5998_2.xml"])) of
-	      {'EXIT',{fatal,Reason1}} ->
-		  case Reason1 of
-		      {{endtag_does_not_match,
-			{was,obj,should_have_been,int}},
-		       _,_,_} -> ok;
-		      _ -> {comment,"parsing changed behaviour"}
-		  end
-	  end,
-
-    ?line case catch xmerl_scan:file(filename:join([DataDir,misc,
-						    "ticket_5998_3.xml"])) of
-	      {'EXIT',{fatal,Reason2}} ->
-		  case Reason2 of
-		      {"expected one of: ?>, standalone, encoding",
-		       _,_,_} -> ok;
-		      _ -> {comment,"parsing changed behaviour"}
-		  end
-	  end.        
-		       
-
-%%
-%% ticket_7211
-%%
-%% A Kleene Closure child in a sequence consumed all following
-%% childs. This problem has been fixed.
-%%
-ticket_7211(Config) ->
-    DataDir = ?config(data_dir,Config),
-    ?line {E,[]} = 
-	xmerl_scan:file(filename:join([DataDir,misc,"notes2.xml"]),
-			[{fetch_path,[filename:join([DataDir,misc,erlang_docs_dtd])]},
-			 {validation,dtd}]),
-    
-    ?line ok = case E of
-		   Rec when is_record(Rec,xmlElement) ->
-		       ok;
-		   _ ->
-		       E
-	       end,
-		       
-    ?line {E2,[]} = 
-	xmerl_scan:file(filename:join([DataDir,misc,"XS.xml"]),
-			[{fetch_path,[filename:join([DataDir,misc,erlang_docs_dtd])]},
-			 {validation,dtd}]),
-    
-    ?line ok = case E2 of
-		   Rec2 when is_record(Rec2,xmlElement) ->
-		       ok;
-		   _ ->
-		       E2
-	       end.
-
-%%
-%% ticket_7214
-%%
-%% Now validating xhtml1-transitional.dtd.
-%% A certain contentspec with a succeding choice, that didn't match
-%% all content, followed by other child elements caused a
-%% failure. This is now corrected.
-%%
-ticket_7214(Config) ->
-    DataDir = ?config(data_dir,Config),
-
-    ?line {E,[]} = 
-	xmerl_scan:file(filename:join([DataDir,misc,'block_tags.html']),
-			[{validation,dtd},
-			 {fetch_path,[filename:join([DataDir,misc,erlang_docs_dtd])]}]),
-    
-    ?line ok = case E of
-		   Rec when is_record(Rec,xmlElement) ->
-		       ok;
-		   _ ->
-		       E
-	       end.
-%%
-%% ticket_7430
-%%
-%% Problem with contents of numeric character references followed by 
-%% UTF-8 characters..
-%%
-ticket_7430(Config) ->
-    DataDir = ?config(data_dir,Config),
-
-    ?line {E,[]} = 
-	xmerl_scan:string("<a>\303\251&#xD;\303\251</a>",
-			  [{encoding, 'utf-8'}]),
 
-    ?line ok = case E of
-		   {xmlElement,a,a,[],
-		    {xmlNamespace,[],[]},
-		    [],1,[],
-		    [{xmlText,[{a,1}],1,[],"�",text},
-		     {xmlText,[{a,1}],2,[],"\n�",text}],
-		    [],_,undeclared} ->
-		       ok;
-		   _ ->
-		       E
-	       end.
+%% Some test suites use the same testdata ("xmerl_sax_std_SUITE" and "xmerl_std_SUITE"),
+%% so the data directory is not cloned. This function retrieves the path to
+%% the original data directory.
 
+get_data_dir(Config) ->
+    Data0 = ?config(data_dir, Config),
+    {ok,Data,_} = regexp:sub(Data0, "xmerl_sax_std_SUITE", "xmerl_sax_std_SUITE"),
+    Data.
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE.erl b/lib/xmerl/test/xmerl_xsd_SUITE.erl
index bbca4cb7aa..74de42aee5 100644
--- a/lib/xmerl/test/xmerl_xsd_SUITE.erl
+++ b/lib/xmerl/test/xmerl_xsd_SUITE.erl
@@ -59,7 +59,7 @@ groups() ->
      {miscXMLexamples, [],
       [small, complexType1, model_group_all,
        substitutionGroup, attributeGroup, test_key1, sis1,
-       sis2, gpx, state2file_file2state, union]},
+       sis2, state2file_file2state, union]},
      {ticket_tests, [],
       [ticket_6910, ticket_7165, ticket_7190, ticket_7288,
        ticket_7736, ticket_8599]},
@@ -1067,33 +1067,6 @@ sis2(Config) ->
 	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),sis,
 						  "mim.xsd"]),HW_E,[]).
 
-gpx(suite) -> [];
-gpx(Config) ->
-%     case application:start(inets) of
-% 	ok ->
-% 	    http:set_options([{proxy, {{"www-proxy.ericsson.se", 8080},
-% 				       ["localhost"]}}]),
-% 	    URI = "http://www.topografix.com/GPX/Private/TopoGrafix/0/2/topografix.xsd",
-% 	    case http:request(get, {URI, []}, [], []) of
-% 		{ok,{{_Version, 200, _ReasonPhrase}, _Headers, _Body}} ->
-% 		    XML = filename:join([?config(data_dir,Config),gpx,
-% 					 "clementine_loop.gpx"]),
-% 		    ?line {E=#xmlElement{},_} = xmerl_scan:file(XML),
-% 		    code:add_patha(filename:join([?config(data_dir,Config),
-% 						  "../proprietary"])),
-% 		    Schema = filename:join([?config(data_dir,Config),gpx,
-% 					    "gpx.xsd"]),
-% 		    ?line {E,_} = 
-% 			xmerl_xsd:process_validate(Schema,E,
-% 					   [{fetch_fun,fun mylib:fetch/2}]);
-% 		_ ->
-% 		    {skip,no_connection}
-% 	    end;
-% 	_ ->
-% 	    {skip,no_connection}
-%     end.
-    {skip,["GPS eXchange Format is skipped for now"]}.
-
 state2file_file2state(suite) -> [];
 state2file_file2state(Config) ->
     ?line {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),