Eliminate use of ?config() macro

7 files changed, 3844 insertions, 3866 deletions

diff --git a/lib/xmerl/test/xmerl_SUITE.erl b/lib/xmerl/test/xmerl_SUITE.erl
index 25b8aaa870..08959cdfb6 100644
--- a/lib/xmerl/test/xmerl_SUITE.erl
+++ b/lib/xmerl/test/xmerl_SUITE.erl
@@ -73,11 +73,11 @@ suite() ->
 init_per_suite(doc) ->
     ["Starts the test suite"];
 init_per_suite(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
+    file:set_cwd(datadir(Config)),
     ok=erl_tar:extract("cpd.tar.gz",[compressed]),
     ok=erl_tar:extract("misc.tar.gz",[compressed]),
     ok = change_mode(["cpd", "misc"]),
-    file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    file:set_cwd(filename:join(datadir(Config),xpath)),
     TestServerIncludeDir=filename:join(filename:dirname(code:priv_dir(test_server)), "include"),
     {ok, xpath_lib} = compile:file(xpath_lib, [{i, TestServerIncludeDir}]),
     {ok, xpath_text} = compile:file(xpath_text, [{i, TestServerIncludeDir}]),
@@ -89,14 +89,14 @@ init_per_suite(Config) ->
 end_per_suite(doc) ->
     ["Stops the test suite"];
 end_per_suite(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
+    file:set_cwd(datadir(Config)),
     ok = rm_files(["cpd", "misc"]),
     ok.
 
 -else.
 end_per_suite(doc) ->
     ["Stops the test suite"];
-end_per_suite(Config) ->
+end_per_suite(_Config) ->
     ok.
 -endif.
 
@@ -104,8 +104,8 @@ end_per_suite(Config) ->
 %% initialization before each testcase
 init_per_testcase(_TestCase,Config) ->
     io:format("Config:~n~p",[Config]),
-    {ok, _} = file:read_file_info(filename:join([?config(priv_dir,Config)])),
-    code:add_patha(?config(priv_dir,Config)),
+    {ok, _} = file:read_file_info(filename:join([privdir(Config)])),
+    code:add_patha(privdir(Config)),
     Config.
 
 
@@ -119,8 +119,8 @@ end_per_testcase(_Func,_Config) ->
 %%----------------------------------------------------------------------
 cpd_invalid1(suite) -> [];
 cpd_invalid1(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
-    case catch xmerl_scan:file(filename:join([?config(data_dir,Config), cpd,"cpd_test.xml"]),[]) of
+    file:set_cwd(datadir(Config)),
+    case catch xmerl_scan:file(datadir_join(Config,[cpd,"cpd_test.xml"]),[]) of
         {'EXIT',{fatal,Reason}} ->
             case Reason of
                 {expected_markup,_Path,28,32} -> ok;
@@ -130,8 +130,8 @@ cpd_invalid1(Config) ->
 
 cpd_invalid1_index(suite) -> [];
 cpd_invalid1_index(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
-    case catch xmerl_scan:file(filename:join([?config(data_dir,Config), cpd,"cpd_index.xml"]),[]) of
+    file:set_cwd(datadir(Config)),
+    case catch xmerl_scan:file(datadir_join(Config,[cpd,"cpd_index.xml"]),[]) of
         {'EXIT',{fatal,Reason}} ->
             case Reason of
                 {{error,{whitespace_was_expected}},_Path,1,19} -> ok;
@@ -141,8 +141,8 @@ cpd_invalid1_index(Config) ->
 
 cpd_invalid2_index(suite) -> [];
 cpd_invalid2_index(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
-    case catch xmerl_scan:file(filename:join([?config(data_dir,Config), cpd,"cpd_index2.xml"]),[]) of
+    file:set_cwd(datadir(Config)),
+    case catch xmerl_scan:file(datadir_join(Config,[cpd,"cpd_index2.xml"]),[]) of
         {'EXIT',{fatal,Reason}} ->
             case Reason of
                 {{invalid_target_name,_Ver},_Path,2,3} ->ok;
@@ -152,8 +152,8 @@ cpd_invalid2_index(Config) ->
 
 cpd_invalid_index3(suite) -> [];
 cpd_invalid_index3(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
-    case catch xmerl_scan:file(filename:join([?config(data_dir,Config), cpd,"cpd_index3.xml"]),[]) of
+    file:set_cwd(datadir(Config)),
+    case catch xmerl_scan:file(datadir_join(Config,[cpd,"cpd_index3.xml"]),[]) of
         {'EXIT',{fatal,Reason}} ->
             case Reason of
                 {expected_markup,_Path,1,2} -> ok;
@@ -163,58 +163,57 @@ cpd_invalid_index3(Config) ->
 
 cpd_invalid_is_layer(suite) -> [];
 cpd_invalid_is_layer(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
-    case catch xmerl_scan:file(filename:join([?config(data_dir,Config), cpd,"is_layer2.xml"]),[]) of
+    file:set_cwd(datadir(Config)),
+    case catch xmerl_scan:file(datadir_join(Config,[cpd,"is_layer2.xml"]),[]) of
         {'EXIT',{fatal,_Reason}} -> ok
     end.
 
 cpd_expl_provided_DTD(suite) -> [];
 cpd_expl_provided_DTD(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
-    {#xmlElement{},[]} = xmerl_scan:file(filename:join([?config(data_dir,Config), cpd,"file_wo_DTD.xml"]),
+    file:set_cwd(datadir(Config)),
+    {#xmlElement{},[]} = xmerl_scan:file(datadir_join(Config,[cpd,"file_wo_DTD.xml"]),
                                          [{validation,true},{doctype_DTD,"separate_DTD.dtd"}]).
 
 %%----------------------------------------------------------------------
 
 xpath_text1(suite) -> [];
 xpath_text1(Config) ->
-    file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    file:set_cwd(filename:join(datadir(Config),xpath)),
     ok = xpath_text:one().
 
 xpath_main(suite) -> [];
 xpath_main(Config) ->
-    file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    file:set_cwd(filename:join(datadir(Config),xpath)),
     ok = xpath_lib:test().
 
 xpath_abbreviated_syntax(suite) -> [];
 xpath_abbreviated_syntax(Config) ->
-    file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    file:set_cwd(filename:join(datadir(Config),xpath)),
     ok = xpath_abbrev:test().
 
 xpath_functions(suite) -> [];
 xpath_functions(Config) ->
-    file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    file:set_cwd(filename:join(datadir(Config),xpath)),
     ok = xpath_abbrev:functions().
 
 xpath_namespaces(suite) -> [];
 xpath_namespaces(Config) ->
-    file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    file:set_cwd(filename:join(datadir(Config),xpath)),
     ok = xpath_abbrev:namespaces().
 
 %%----------------------------------------------------------------------
 
 latin1_alias(suite) -> [];
 latin1_alias(Config) ->
-%    file:set_cwd(filename:join(?config(data_dir,Config),misc)),
-    file:set_cwd(?config(data_dir,Config)),
-    {_Elements,[]}= xmerl_scan:file(filename:join([?config(data_dir,Config),
-                                                   misc,"motorcycles.xml"]),
-                                    [{validation,true},
-                                     {encoding,'iso-8859-1'}]).
+%    file:set_cwd(filename:join(datadir(Config),misc)),
+    file:set_cwd(datadir(Config)),
+    {_Elements,[]} = xmerl_scan:file(datadir_join(Config,[misc,"motorcycles.xml"]),
+                                     [{validation,true},
+                                      {encoding,'iso-8859-1'}]).
 
 syntax_bug1(suite) -> [];
 syntax_bug1(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
+    file:set_cwd(datadir(Config)),
     {fatal,{"expected one of: ?>, standalone, encoding",
             {file,'misc/syntax_bug1.xml'},{line,1},{col,21}}
     } = case catch xmerl_scan:file('misc/syntax_bug1.xml') of
@@ -225,7 +224,7 @@ syntax_bug1(Config) ->
 
 syntax_bug2(suite) -> [];
 syntax_bug2(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
+    file:set_cwd(datadir(Config)),
     {fatal,{"expected one of: ?>, whitespace_character",
             {file,'misc/syntax_bug2.xml'},{line,1},{col,20}}
     } = case catch xmerl_scan:file('misc/syntax_bug2.xml') of
@@ -236,7 +235,7 @@ syntax_bug2(Config) ->
 
 syntax_bug3(suite) -> [];
 syntax_bug3(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
+    file:set_cwd(datadir(Config)),
     {fatal,{{endtag_does_not_match,{was,obj,should_have_been,int}},
             {file,'misc/syntax_bug3.xml'},{line,4},{col,3}}
     } = case catch xmerl_scan:file('misc/syntax_bug3.xml') of
@@ -247,21 +246,21 @@ syntax_bug3(Config) ->
 
 pe_ref1(suite) -> [];
 pe_ref1(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
-    {#xmlElement{},[]} = xmerl_scan:file(filename:join([?config(data_dir,Config), misc,"PE_ref1.xml"]),[{validation,true}]).
+    file:set_cwd(datadir(Config)),
+    {#xmlElement{},[]} = xmerl_scan:file(datadir_join(Config,[misc,"PE_ref1.xml"]),[{validation,true}]).
 
 copyright(suite) -> [];
 copyright(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
-    {#xmlElement{},[]} = xmerl_scan:file(filename:join([?config(data_dir,Config), misc,"cprght.xml"]),[{validation,true}]).
+    file:set_cwd(datadir(Config)),
+    {#xmlElement{},[]} = xmerl_scan:file(datadir_join(Config,[misc,"cprght.xml"]),[{validation,true}]).
 
 testXSEIF(suite) -> [];
 testXSEIF(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
-    {#xmlElement{},[]} = xmerl_scan:file(filename:join([?config(data_dir,Config), misc,"ReplBoard_1_1543-CNA11313Uen.xml"]),[{validation,true}]).
+    file:set_cwd(datadir(Config)),
+    {#xmlElement{},[]} = xmerl_scan:file(datadir_join(Config,[misc,"ReplBoard_1_1543-CNA11313Uen.xml"]),[{validation,true}]).
 
 export_simple1(suite) -> [];
-export_simple1(Config) ->
+export_simple1(_Config) ->
     Simple = simple(),
     Res = xmerl:export_simple(Simple,xmerl_xml,[{title, "Doc Title"}]),
     "<?xml version="++_ = lists:flatten(Res),
@@ -274,7 +273,7 @@ export_simple1(Config) ->
 
 export(suite) -> [];
 export(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = datadir(Config),
     Prolog = ["<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<!DOCTYPE motorcycles SYSTEM \"motorcycles.dtd\">\n"],
     TestFile = filename:join([DataDir,"misc","motorcycles.xml"]),
     {E,_} = xmerl_scan:file(TestFile),
@@ -293,8 +292,8 @@ sax_parse_and_export(Config) ->
 %%----------------------------------------------------------------------
 
 sax_parse_export_xml_big(Config) ->
-    DataDir = ?config(data_dir,Config),
-    OutDir = ?config(priv_dir,Config),
+    DataDir = datadir(Config),
+    OutDir = privdir(Config),
     io:format("DataDir: ~p~n,OutDir:~p~n",[DataDir,OutDir]),
     CMOMxml = filename:join([DataDir,"eventp","CMOM.xml"]),
     {Ex,[]} = xmerl_eventp:file_sax(CMOMxml, xmerl_xml,[],[]),
@@ -310,8 +309,8 @@ sax_parse_export_xml_big(Config) ->
     ok.
 
 sax_parse_export_xml_small(Config) ->
-    DataDir = ?config(data_dir,Config),
-    OutDir = ?config(priv_dir,Config),
+    DataDir = datadir(Config),
+    OutDir = privdir(Config),
     Wurfl_xml = filename:join([DataDir,"eventp","wurfl.xml"]),
     {Ex,[]} = xmerl_eventp:file_sax(Wurfl_xml, xmerl_xml,[],[]),
     OutFile = filename:join([OutDir,"wrfl"]),
@@ -427,10 +426,10 @@ generate_heading_col(N) ->
 %%
 ticket_5998(suite) -> [];
 ticket_5998(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = datadir(Config),
     %% First fix is tested by case syntax_bug2.
     
-    case catch xmerl_scan:file(filename:join([DataDir,misc, "ticket_5998_2.xml"])) of
+    case catch xmerl_scan:file(filename:join([DataDir,misc,"ticket_5998_2.xml"])) of
         {'EXIT',{fatal,Reason1}} ->
             case Reason1 of
                 {{endtag_does_not_match,
@@ -440,7 +439,7 @@ ticket_5998(Config) ->
             end
     end,
 
-    case catch xmerl_scan:file(filename:join([DataDir,misc, "ticket_5998_3.xml"])) of
+    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",
@@ -458,7 +457,7 @@ ticket_5998(Config) ->
 %%
 ticket_7211(suite) -> [];
 ticket_7211(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = datadir(Config),
     {E,[]} = xmerl_scan:file(filename:join([DataDir,misc,"notes2.xml"]),
                              [{fetch_path,[filename:join([DataDir,misc,erlang_docs_dtd])]},
                               {validation,dtd}]),
@@ -491,7 +490,7 @@ ticket_7211(Config) ->
 %%
 ticket_7214(suite) -> [];
 ticket_7214(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = datadir(Config),
 
     {E,[]} = xmerl_scan:file(filename:join([DataDir,misc,'block_tags.html']),
                              [{validation,dtd},
@@ -512,7 +511,7 @@ ticket_7214(Config) ->
 %%
 ticket_7430(suite) -> [];
 ticket_7430(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = datadir(Config),
 
     {E,[]} = xmerl_scan:string("<a>\303\251&#xD;\303\251</a>",[{encoding,'utf-8'}]),
 
@@ -530,13 +529,13 @@ ticket_7430(Config) ->
 
 ticket_6873(suite) -> [];
 ticket_6873(Config) ->
-    file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    file:set_cwd(filename:join(datadir(Config),xpath)),
     ok = xpath_abbrev:ticket_6873(),
     ok = xpath_lib:ticket_6873().
 
 ticket_7496(suite) -> [];
 ticket_7496(Config) ->
-    file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    file:set_cwd(filename:join(datadir(Config),xpath)),
     ok = xpath_abbrev:ticket_7496().
 
 ticket_8156(suite) -> [];
@@ -567,7 +566,7 @@ ticket_9411(suite) -> [];
 ticket_9411(doc) -> 
     ["Test that xmerl_scan handles attribute that contains for example &quot"];
 ticket_9411(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = datadir(Config),
 
     {ok, Schema} = xmerl_xsd:process_schema(filename:join([DataDir,"misc/ticket_9411.xsd"])),
     {ok, Bin} = file:read_file(filename:join([DataDir,"misc/ticket_9411.xml"])),
@@ -602,29 +601,23 @@ ticket_9664_schema(doc) ->
     ["Test that comments are handled correct whith"];
 ticket_9664_schema(Config) ->
 
-    {E, _} = xmerl_scan:file(filename:join([?config(data_dir, Config), misc,
-						  "ticket_9664_schema.xml"]),[]),
-    {ok, S} = xmerl_xsd:process_schema(filename:join([?config(data_dir, Config), misc,
-							    "motorcycles.xsd"])),
+    {E, _} = xmerl_scan:file(datadir_join(Config,[misc,"ticket_9664_schema.xml"]),[]),
+    {ok, S} = xmerl_xsd:process_schema(datadir_join(Config,[misc,"motorcycles.xsd"])),
     {E1, _} = xmerl_xsd:validate(E, S),
 
-    {E1,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), misc,
-							    "motorcycles.xsd"]),E,[]),
+    {E1,_} = xmerl_xsd:process_validate(datadir_join(Config,[misc,"motorcycles.xsd"]),E,[]),
 
-    {E1,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),  misc,
-						 "ticket_9664_schema.xml"]), 
-				  [{schemaLocation, [{"mc", "motorcycles.xsd"}]},
-				   {validation, schema}]),
+    {E1,_} = xmerl_scan:file(datadir_join(Config,[misc,"ticket_9664_schema.xml"]),
+                             [{schemaLocation, [{"mc", "motorcycles.xsd"}]},
+                              {validation, schema}]),
     ok.
 
 ticket_9664_dtd(suite) -> [];
 ticket_9664_dtd(doc) -> 
     ["Test that comments are handled correct whith"];
 ticket_9664_dtd(Config) ->
-    {E, _} = xmerl_scan:file(filename:join([?config(data_dir, Config),  misc,
-						  "ticket_9664_dtd.xml"]),[]),
-    {E, _} = xmerl_scan:file(filename:join([?config(data_dir, Config),  misc,
-						  "ticket_9664_dtd.xml"]),[{validation, true}]),
+    {E, _} = xmerl_scan:file(datadir_join(Config,[misc,"ticket_9664_dtd.xml"]),[]),
+    {E, _} = xmerl_scan:file(datadir_join(Config,[misc,"ticket_9664_dtd.xml"]),[{validation, true}]),
     ok.
 
 
@@ -680,3 +673,11 @@ chmod(F) ->
 	_ ->
 	    ok
     end.
+
+privdir(Config) ->
+    proplists:get_value(priv_dir, Config).
+datadir(Config) ->
+    proplists:get_value(data_dir, Config).
+
+datadir_join(Config,Files) ->
+    filename:join([datadir(Config)|Files]).
diff --git a/lib/xmerl/test/xmerl_sax_SUITE.erl b/lib/xmerl/test/xmerl_sax_SUITE.erl
index 9f981b3e03..22ad8377cc 100644
--- a/lib/xmerl/test/xmerl_sax_SUITE.erl
+++ b/lib/xmerl/test/xmerl_sax_SUITE.erl
@@ -38,25 +38,11 @@
 %% Initializations
 %%----------------------------------------------------------------------
 
-init_per_suite(doc) ->
-    ["Starts the test suite"];
-init_per_suite(Config) ->
-    Config.
- 
-end_per_suite(doc) ->
-    ["Stops the test suite"];
-end_per_suite(Config) ->
-    Config.
- 
+all() ->
+    [{group, bugs}].
 
- 
-%% initialization before each testcase
-init_per_testcase(_TestCase,Config) ->
-    Config.
- 
-%% clean up after each testcase
-end_per_testcase(_Func,_Config) ->
-    ok.
+groups() ->
+    [{bugs, [], [ticket_8213, ticket_8214, ticket_11551]}].
 
 %%----------------------------------------------------------------------
 %% Tests
@@ -97,7 +83,7 @@ ticket_8214(_Config) ->
 %% ID: ticket_8214
 %% Description: Checks that attributes with default namespace don't get [] in NS field.
 ticket_11551(suite) -> [];
-ticket_11551(Config) -> 
+ticket_11551(_Config) ->
     Stream1 = <<"<?xml version=\"1.0\" encoding=\"utf-8\" ?>
 <a>hej</a>
 <?xml version=\"1.0\" encoding=\"utf-8\" ?>
@@ -116,26 +102,3 @@ ticket_11551(Config) ->
 <a>hej</a>">>,
     {ok, undefined, <<"<?xml",  _/binary>>} = xmerl_sax_parser:stream(Stream3, []),
     ok.
-		    
-
-
-%%----------------------------------------------------------------------
-%% Bug test cases
-%%
-
-%%----------------------------------------------------------------------
-%% Test Suite 
-%% 
-all() -> 
-    [{group, bugs}].
-
-groups() -> 
-    [{bugs, [], [ticket_8213, ticket_8214, ticket_11551]}].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
diff --git a/lib/xmerl/test/xmerl_sax_std_SUITE.erl b/lib/xmerl/test/xmerl_sax_std_SUITE.erl
index f2f88f62a6..28a287c080 100644
--- a/lib/xmerl/test/xmerl_sax_std_SUITE.erl
+++ b/lib/xmerl/test/xmerl_sax_std_SUITE.erl
@@ -72,8 +72,8 @@ end_per_suite(Config) ->
 %% initialization before each testcase
 init_per_testcase(_TestCase,Config) ->
     io:format("Config:\n~p\n",[Config]),
-    {ok, _} = file:read_file_info(filename:join([?config(priv_dir,Config)])),
-    code:add_patha(?config(priv_dir,Config)),
+    {ok, _} = file:read_file_info(filename:join([privdir(Config)])),
+    code:add_patha(privdir(Config)),
     Config.
  
 %% clean up after each testcase
@@ -25621,6 +25621,9 @@ chmod(F) ->
 	    ok
     end.
 
+privdir(Config) ->
+    proplists:get_value(priv_dir, Config).
+
 %%----------------------------------------------------------------------
 %% check_result 
 check_result({fatal_error,_,_,_,_}, "error") -> 
diff --git a/lib/xmerl/test/xmerl_std_SUITE.erl b/lib/xmerl/test/xmerl_std_SUITE.erl
index c502a28e02..e7b3469f73 100644
--- a/lib/xmerl/test/xmerl_std_SUITE.erl
+++ b/lib/xmerl/test/xmerl_std_SUITE.erl
@@ -754,7 +754,7 @@ suite() ->
 init_per_suite(doc) ->
     ["Starts the test suite"];
 init_per_suite(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
+    file:set_cwd(datadir(Config)),
     ok = erl_tar:extract("ibm.tgz",[compressed]),
     ok = erl_tar:extract("japanese.tgz",[compressed]),
     ok = erl_tar:extract("oasis.tgz",[compressed]),
@@ -768,7 +768,7 @@ init_per_suite(Config) ->
 end_per_suite(doc) ->
     ["Stops the test suite"];
 end_per_suite(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
+    file:set_cwd(datadir(Config)),
     ok = rm_files(["ibm","japanese","oasis","sun","xmltest"]),
     ok.
 
@@ -782,8 +782,8 @@ end_per_suite(Config) ->
 %% initialization before each testcase
 init_per_testcase(_TestCase,Config) ->
     io:format("Config:~n~p",[Config]),
-    {ok, _} = file:read_file_info(filename:join([?config(priv_dir,Config)])),
-    code:add_patha(?config(priv_dir,Config)),
+    {ok, _} = file:read_file_info(filename:join([privdir(Config)])),
+    code:add_patha(privdir(Config)),
     Config.
 
 
@@ -797,954 +797,954 @@ end_per_testcase(_Func,_Config) ->
 %%----------------------------------------------------------------------
 'v-pe02'(suite) -> [];
 'v-pe02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-pe02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"v-pe02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'v-pe03'(suite) -> [];
 'v-pe03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-pe03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"v-pe03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'v-pe00'(suite) -> [];
 'v-pe00'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-pe00.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"v-pe00.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'v-lang06'(suite) -> [];
 'v-lang06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-lang06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"v-lang06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'v-lang05'(suite) -> [];
 'v-lang05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-lang05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"v-lang05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'v-lang04'(suite) -> [];
 'v-lang04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-lang04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"v-lang04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'v-lang03'(suite) -> [];
 'v-lang03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-lang03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"v-lang03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'v-lang02'(suite) -> [];
 'v-lang02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-lang02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"v-lang02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'v-lang01'(suite) -> [];
 'v-lang01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-lang01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"v-lang01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'v-sgml01'(suite) -> [];
 'v-sgml01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"v-sgml01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"v-sgml01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sa05'(suite) -> [];
 'sa05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sa05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sa05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sa04'(suite) -> [];
 'sa04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sa04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sa04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sa03'(suite) -> [];
 'sa03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sa03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sa03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sa02'(suite) -> [];
 'sa02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sa02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sa02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sa01'(suite) -> [];
 'sa01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sa01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sa01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'required00'(suite) -> [];
 'required00'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"required00.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"required00.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional'(suite) -> [];
 'optional'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'notation01'(suite) -> [];
 'notation01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"notation01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"notation01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-sa04'(suite) -> [];
 'not-sa04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"not-sa04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"not-sa04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-sa03'(suite) -> [];
 'not-sa03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"not-sa03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"not-sa03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-sa02'(suite) -> [];
 'not-sa02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"not-sa02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"not-sa02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-sa01'(suite) -> [];
 'not-sa01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"not-sa01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"not-sa01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ext02'(suite) -> [];
 'ext02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"ext02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"ext02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ext01'(suite) -> [];
 'ext01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"ext01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"ext01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'element'(suite) -> [];
 'element'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"element.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"element.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'dtd01'(suite) -> [];
 'dtd01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"dtd01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"dtd01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'dtd00'(suite) -> [];
 'dtd00'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"dtd00.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"dtd00.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'pe01'(suite) -> [];
 'pe01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"pe01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"pe01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 %%----------------------------------------------------------------------
 
 'empty'(suite) -> [];
 'empty'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"empty.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"empty.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'utf16l'(suite) -> [];
 'utf16l'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"utf16l.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"utf16l.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'utf16b'(suite) -> [];
 'utf16b'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"utf16b.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"utf16b.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr16'(suite) -> [];
 'attr16'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr16.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr16.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr15'(suite) -> [];
 'attr15'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr15.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr15.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr14'(suite) -> [];
 'attr14'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr14.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr14.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr13'(suite) -> [];
 'attr13'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr13.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr13.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr12'(suite) -> [];
 'attr12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr11'(suite) -> [];
 'attr11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr10'(suite) -> [];
 'attr10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr09'(suite) -> [];
 'attr09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr08'(suite) -> [];
 'attr08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr07'(suite) -> [];
 'attr07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr06'(suite) -> [];
 'attr06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr05'(suite) -> [];
 'attr05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr04'(suite) -> [];
 'attr04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr03'(suite) -> [];
 'attr03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr02'(suite) -> [];
 'attr02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attr01'(suite) -> [];
 'attr01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attr01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attr01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'root'(suite) -> [];
 'root'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"root.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"root.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-required02'(suite) -> [];
 'inv-required02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-required02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-required02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-required01'(suite) -> [];
 'inv-required01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-required01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-required01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-required00'(suite) -> [];
 'inv-required00'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-required00.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-required00.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional25'(suite) -> [];
 'optional25'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional25.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional25.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional24'(suite) -> [];
 'optional24'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional24.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional24.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional23'(suite) -> [];
 'optional23'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional23.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional23.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional22'(suite) -> [];
 'optional22'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional22.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional22.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional21'(suite) -> [];
 'optional21'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional21.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional21.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional20'(suite) -> [];
 'optional20'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional20.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional20.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional14'(suite) -> [];
 'optional14'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional14.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional14.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional13'(suite) -> [];
 'optional13'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional13.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional13.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional12'(suite) -> [];
 'optional12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional11'(suite) -> [];
 'optional11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional10'(suite) -> [];
 'optional10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional09'(suite) -> [];
 'optional09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional08'(suite) -> [];
 'optional08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional07'(suite) -> [];
 'optional07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional06'(suite) -> [];
 'optional06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional05'(suite) -> [];
 'optional05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional04'(suite) -> [];
 'optional04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional03'(suite) -> [];
 'optional03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional02'(suite) -> [];
 'optional02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'optional01'(suite) -> [];
 'optional01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"optional01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"optional01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-not-sa14'(suite) -> [];
 'inv-not-sa14'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa14.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-not-sa14.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-not-sa13'(suite) -> [];
 'inv-not-sa13'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa13.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-not-sa13.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-not-sa12'(suite) -> [];
 'inv-not-sa12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-not-sa12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-not-sa11'(suite) -> [];
 'inv-not-sa11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-not-sa11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-not-sa10'(suite) -> [];
 'inv-not-sa10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-not-sa10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-not-sa09'(suite) -> [];
 'inv-not-sa09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-not-sa09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-not-sa08'(suite) -> [];
 'inv-not-sa08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-not-sa08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-not-sa07'(suite) -> [];
 'inv-not-sa07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-not-sa07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-not-sa06'(suite) -> [];
 'inv-not-sa06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-not-sa06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-not-sa05'(suite) -> [];
 'inv-not-sa05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-not-sa05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-not-sa04'(suite) -> [];
 'inv-not-sa04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-not-sa04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-not-sa02'(suite) -> [];
 'inv-not-sa02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-not-sa02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-not-sa01'(suite) -> [];
 'inv-not-sa01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-not-sa01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-not-sa01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'id09'(suite) -> [];
 'id09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"id09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'id08'(suite) -> [];
 'id08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"id08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'id07'(suite) -> [];
 'id07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"id07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'id06'(suite) -> [];
 'id06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"id06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'id05'(suite) -> [];
 'id05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"id05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'id04'(suite) -> [];
 'id04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"id04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'id03'(suite) -> [];
 'id03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"id03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'id02'(suite) -> [];
 'id02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"id02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'id01'(suite) -> [];
 'id01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"id01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"id01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'el06'(suite) -> [];
 'el06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"el06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"el06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'el05'(suite) -> [];
 'el05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"el05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"el05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'el04'(suite) -> [];
 'el04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"el04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"el04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'el03'(suite) -> [];
 'el03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"el03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"el03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'el02'(suite) -> [];
 'el02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"el02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"el02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'el01'(suite) -> [];
 'el01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"el01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"el01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-dtd03'(suite) -> [];
 'inv-dtd03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-dtd03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-dtd03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-dtd02'(suite) -> [];
 'inv-dtd02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-dtd02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-dtd02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'inv-dtd01'(suite) -> [];
 'inv-dtd01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"inv-dtd01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"inv-dtd01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 %%----------------------------------------------------------------------
 
 'sgml13'(suite) -> [];
 'sgml13'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml13.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sgml13.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sgml12'(suite) -> [];
 'sgml12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sgml12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sgml11'(suite) -> [];
 'sgml11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sgml11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sgml10'(suite) -> [];
 'sgml10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sgml10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sgml09'(suite) -> [];
 'sgml09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sgml09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sgml08'(suite) -> [];
 'sgml08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sgml08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sgml07'(suite) -> [];
 'sgml07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sgml07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sgml06'(suite) -> [];
 'sgml06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sgml06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sgml05'(suite) -> [];
 'sgml05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sgml05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sgml04'(suite) -> [];
 'sgml04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sgml04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sgml03'(suite) -> [];
 'sgml03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sgml03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sgml02'(suite) -> [];
 'sgml02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sgml02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'sgml01'(suite) -> [];
 'sgml01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"sgml01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"sgml01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'pubid05'(suite) -> [];
 'pubid05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"pubid05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"pubid05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'pubid04'(suite) -> [];
 'pubid04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"pubid04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"pubid04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'pubid03'(suite) -> [];
 'pubid03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"pubid03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"pubid03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'pubid02'(suite) -> [];
 'pubid02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"pubid02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"pubid02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'pubid01'(suite) -> [];
 'pubid01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"pubid01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"pubid01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'pi'(suite) -> [];
 'pi'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"pi.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"pi.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'encoding07'(suite) -> [];
 'encoding07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"encoding07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"encoding07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'encoding06'(suite) -> [];
 'encoding06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"encoding06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"encoding06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'encoding05'(suite) -> [];
 'encoding05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"encoding05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"encoding05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'encoding04'(suite) -> [];
 'encoding04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"encoding04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"encoding04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'encoding03'(suite) -> [];
 'encoding03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"encoding03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"encoding03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'encoding02'(suite) -> [];
 'encoding02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"encoding02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"encoding02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'encoding01'(suite) -> [];
 'encoding01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"encoding01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"encoding01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'element04'(suite) -> [];
 'element04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"element04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"element04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'element03'(suite) -> [];
 'element03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"element03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"element03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'element02'(suite) -> [];
 'element02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"element02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"element02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'element01'(suite) -> [];
 'element01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"element01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"element01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'element00'(suite) -> [];
 'element00'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"element00.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"element00.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'dtd07'(suite) -> [];
 'dtd07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"dtd07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"dtd07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'dtd05'(suite) -> [];
 'dtd05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"dtd05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"dtd05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'dtd04'(suite) -> [];
 'dtd04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"dtd04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"dtd04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'dtd03'(suite) -> [];
 'dtd03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"dtd03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"dtd03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'dtd02'(suite) -> [];
 'dtd02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"dtd02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"dtd02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'nwf-dtd01'(suite) -> [];
 'nwf-dtd01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"nwf-dtd01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"nwf-dtd01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'nwf-dtd00'(suite) -> [];
 'nwf-dtd00'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"nwf-dtd00.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"nwf-dtd00.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'decl01'(suite) -> [];
 'decl01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"decl01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"decl01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'content03'(suite) -> [];
 'content03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"content03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"content03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'content02'(suite) -> [];
 'content02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"content02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"content02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'content01'(suite) -> [];
 'content01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"content01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"content01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'cond02'(suite) -> [];
 'cond02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"cond02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"cond02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'cond01'(suite) -> [];
 'cond01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"cond01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"cond01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attlist11'(suite) -> [];
 'attlist11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attlist11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attlist10'(suite) -> [];
 'attlist10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attlist10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attlist09'(suite) -> [];
 'attlist09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attlist09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attlist08'(suite) -> [];
 'attlist08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attlist08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attlist07'(suite) -> [];
 'attlist07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attlist07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attlist06'(suite) -> [];
 'attlist06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attlist06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attlist05'(suite) -> [];
 'attlist05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attlist05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attlist04'(suite) -> [];
 'attlist04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attlist04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attlist03'(suite) -> [];
 'attlist03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attlist03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attlist02'(suite) -> [];
 'attlist02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attlist02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'attlist01'(suite) -> [];
 'attlist01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"attlist01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"attlist01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa03'(suite) -> [];
 'not-wf-sa03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"not-wf-sa03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"not-wf-sa03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 %%----------------------------------------------------------------------
@@ -1753,8 +1753,8 @@ end_per_testcase(_Func,_Config) ->
 'uri01'(doc) ->
     ["URI fragments disallowed"];
 'uri01'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sun,"uri01.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[sun,"uri01.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["URI fragments disallowed"]}.
 
@@ -1762,9951 +1762,9951 @@ end_per_testcase(_Func,_Config) ->
 
 'valid-ext-sa-014'(suite) -> [];
 'valid-ext-sa-014'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-014.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-ext-sa-014.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-ext-sa-013'(suite) -> [];
 'valid-ext-sa-013'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-013.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-ext-sa-013.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-ext-sa-012'(suite) -> [];
 'valid-ext-sa-012'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-012.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-ext-sa-012.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-ext-sa-011'(suite) -> [];
 'valid-ext-sa-011'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-011.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-ext-sa-011.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-ext-sa-009'(suite) -> [];
 'valid-ext-sa-009'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-009.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-ext-sa-009.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-ext-sa-008'(suite) -> [];
 'valid-ext-sa-008'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-008.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-ext-sa-008.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-ext-sa-007'(suite) -> [];
 'valid-ext-sa-007'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-007.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-ext-sa-007.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-ext-sa-006'(suite) -> [];
 'valid-ext-sa-006'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-006.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-ext-sa-006.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-ext-sa-005'(suite) -> [];
 'valid-ext-sa-005'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-005.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-ext-sa-005.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-ext-sa-004'(suite) -> [];
 'valid-ext-sa-004'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-004.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-ext-sa-004.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-ext-sa-003'(suite) -> [];
 'valid-ext-sa-003'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-003.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-ext-sa-003.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-ext-sa-002'(suite) -> [];
 'valid-ext-sa-002'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-002.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-ext-sa-002.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-ext-sa-001'(suite) -> [];
 'valid-ext-sa-001'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-ext-sa-001.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-ext-sa-001.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-031'(suite) -> [];
 'valid-not-sa-031'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-031.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-031.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-030'(suite) -> [];
 'valid-not-sa-030'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-030.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-030.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-029'(suite) -> [];
 'valid-not-sa-029'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-029.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-029.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-028'(suite) -> [];
 'valid-not-sa-028'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-028.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-028.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-027'(suite) -> [];
 'valid-not-sa-027'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-027.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-027.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-026'(suite) -> [];
 'valid-not-sa-026'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-026.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-026.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-025'(suite) -> [];
 'valid-not-sa-025'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-025.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-025.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-024'(suite) -> [];
 'valid-not-sa-024'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-024.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-024.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-023'(suite) -> [];
 'valid-not-sa-023'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-023.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-023.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-021'(suite) -> [];
 'valid-not-sa-021'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-021.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-021.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-020'(suite) -> [];
 'valid-not-sa-020'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-020.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-020.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-019'(suite) -> [];
 'valid-not-sa-019'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-019.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-019.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-018'(suite) -> [];
 'valid-not-sa-018'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-018.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-018.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-017'(suite) -> [];
 'valid-not-sa-017'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-017.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-017.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-016'(suite) -> [];
 'valid-not-sa-016'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-016.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-016.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-015'(suite) -> [];
 'valid-not-sa-015'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-015.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-015.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-014'(suite) -> [];
 'valid-not-sa-014'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-014.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-014.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-013'(suite) -> [];
 'valid-not-sa-013'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-013.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-013.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-012'(suite) -> [];
 'valid-not-sa-012'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-012.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-012.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-011'(suite) -> [];
 'valid-not-sa-011'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-011.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-011.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-010'(suite) -> [];
 'valid-not-sa-010'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-010.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-010.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-009'(suite) -> [];
 'valid-not-sa-009'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-009.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-009.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-008'(suite) -> [];
 'valid-not-sa-008'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-008.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-008.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-007'(suite) -> [];
 'valid-not-sa-007'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-007.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-007.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-006'(suite) -> [];
 'valid-not-sa-006'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-006.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-006.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-005'(suite) -> [];
 'valid-not-sa-005'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-005.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-005.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-004'(suite) -> [];
 'valid-not-sa-004'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-004.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-004.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-003'(suite) -> [];
 'valid-not-sa-003'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-003.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-003.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-002'(suite) -> [];
 'valid-not-sa-002'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-002.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-002.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-not-sa-001'(suite) -> [];
 'valid-not-sa-001'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-not-sa-001.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-not-sa-001.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-119'(suite) -> [];
 'valid-sa-119'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-119.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-119.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-118'(suite) -> [];
 'valid-sa-118'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-118.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-118.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-117'(suite) -> [];
 'valid-sa-117'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-117.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-117.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-116'(suite) -> [];
 'valid-sa-116'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-116.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-116.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-115'(suite) -> [];
 'valid-sa-115'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-115.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-115.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-114'(suite) -> [];
 'valid-sa-114'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-114.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-114.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-113'(suite) -> [];
 'valid-sa-113'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-113.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-113.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-112'(suite) -> [];
 'valid-sa-112'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-112.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-112.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-111'(suite) -> [];
 'valid-sa-111'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-111.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-111.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-110'(suite) -> [];
 'valid-sa-110'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-110.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-110.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-109'(suite) -> [];
 'valid-sa-109'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-109.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-109.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-108'(suite) -> [];
 'valid-sa-108'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-108.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-108.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-107'(suite) -> [];
 'valid-sa-107'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-107.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-107.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-106'(suite) -> [];
 'valid-sa-106'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-106.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-106.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-105'(suite) -> [];
 'valid-sa-105'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-105.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-105.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-104'(suite) -> [];
 'valid-sa-104'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-104.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-104.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-103'(suite) -> [];
 'valid-sa-103'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-103.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-103.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-102'(suite) -> [];
 'valid-sa-102'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-102.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-102.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-101'(suite) -> [];
 'valid-sa-101'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-101.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-101.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-100'(suite) -> [];
 'valid-sa-100'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-%  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-100.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+%  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-100.xml"]),[]),
 %  xmerl:export([A],xmerl_test).
     {skip,["recursive xml spec"]}.
 
 'valid-sa-099'(suite) -> [];
 'valid-sa-099'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-099.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-099.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-098'(suite) -> [];
 'valid-sa-098'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-098.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-098.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-097'(suite) -> [];
 'valid-sa-097'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-097.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-097.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-096'(suite) -> [];
 'valid-sa-096'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-096.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-096.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-095'(suite) -> [];
 'valid-sa-095'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-095.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-095.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-094'(suite) -> [];
 'valid-sa-094'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-094.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-094.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-093'(suite) -> [];
 'valid-sa-093'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-093.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-093.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-092'(suite) -> [];
 'valid-sa-092'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-092.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-092.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-091'(suite) -> [];
 'valid-sa-091'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-091.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-091.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-090'(suite) -> [];
 'valid-sa-090'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-090.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-090.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-089'(suite) -> [];
 'valid-sa-089'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-089.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-089.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-088'(suite) -> [];
 'valid-sa-088'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-088.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-088.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-087'(suite) -> [];
 'valid-sa-087'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-087.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-087.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-086'(suite) -> [];
 'valid-sa-086'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-086.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-086.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-085'(suite) -> [];
 'valid-sa-085'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-085.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-085.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-084'(suite) -> [];
 'valid-sa-084'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-084.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-084.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-083'(suite) -> [];
 'valid-sa-083'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-083.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-083.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-082'(suite) -> [];
 'valid-sa-082'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-082.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-082.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-081'(suite) -> [];
 'valid-sa-081'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-081.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-081.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-080'(suite) -> [];
 'valid-sa-080'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-080.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-080.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-079'(suite) -> [];
 'valid-sa-079'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-079.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-079.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-078'(suite) -> [];
 'valid-sa-078'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-078.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-078.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-077'(suite) -> [];
 'valid-sa-077'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-077.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-077.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-076'(suite) -> [];
 'valid-sa-076'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-076.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-076.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-075'(suite) -> [];
 'valid-sa-075'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-075.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-075.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-074'(suite) -> [];
 'valid-sa-074'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-074.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-074.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-073'(suite) -> [];
 'valid-sa-073'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-073.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-073.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-072'(suite) -> [];
 'valid-sa-072'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-072.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-072.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-071'(suite) -> [];
 'valid-sa-071'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-071.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-071.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-070'(suite) -> [];
 'valid-sa-070'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-070.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-070.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-069'(suite) -> [];
 'valid-sa-069'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-069.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-069.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-068'(suite) -> [];
 'valid-sa-068'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-068.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-068.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-067'(suite) -> [];
 'valid-sa-067'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-067.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-067.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-066'(suite) -> [];
 'valid-sa-066'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-066.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-066.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-065'(suite) -> [];
 'valid-sa-065'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-065.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-065.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-064'(suite) -> [];
 'valid-sa-064'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-064.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-064.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["Fails to handle UTF-8 encoded names, when they are converted to atoms"]}.
 
 'valid-sa-063'(suite) -> [];
 'valid-sa-063'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-063.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-063.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["Fails to handle Unicode integer (UTF-8) encoded names, when they are converted to atoms"]}.
 
 'valid-sa-062'(suite) -> [];
 'valid-sa-062'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-062.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-062.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-061'(suite) -> [];
 'valid-sa-061'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-061.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-061.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-060'(suite) -> [];
 'valid-sa-060'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-060.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-060.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-059'(suite) -> [];
 'valid-sa-059'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-059.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-059.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-058'(suite) -> [];
 'valid-sa-058'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-058.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-058.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-057'(suite) -> [];
 'valid-sa-057'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-057.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-057.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-056'(suite) -> [];
 'valid-sa-056'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-056.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-056.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-055'(suite) -> [];
 'valid-sa-055'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-055.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-055.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-054'(suite) -> [];
 'valid-sa-054'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-054.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-054.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-053'(suite) -> [];
 'valid-sa-053'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-053.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-053.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-052'(suite) -> [];
 'valid-sa-052'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-052.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-052.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-051'(suite) -> [];
 'valid-sa-051'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-051.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-051.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["Fails to handle Unicode integer (UTF-16) encoded names, when they are converted to atoms"]}.
 'valid-sa-050'(suite) -> [];
 'valid-sa-050'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-050.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-050.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-049'(suite) -> [];
 'valid-sa-049'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-049.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-049.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-048'(suite) -> [];
 'valid-sa-048'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-048.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-048.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-047'(suite) -> [];
 'valid-sa-047'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-047.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-047.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-046'(suite) -> [];
 'valid-sa-046'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-046.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-046.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-045'(suite) -> [];
 'valid-sa-045'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-045.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-045.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-044'(suite) -> [];
 'valid-sa-044'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-044.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-044.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-043'(suite) -> [];
 'valid-sa-043'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-043.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-043.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-042'(suite) -> [];
 'valid-sa-042'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-042.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-042.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-041'(suite) -> [];
 'valid-sa-041'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-041.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-041.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-040'(suite) -> [];
 'valid-sa-040'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-040.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-040.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-039'(suite) -> [];
 'valid-sa-039'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-039.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-039.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-038'(suite) -> [];
 'valid-sa-038'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-038.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-038.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-037'(suite) -> [];
 'valid-sa-037'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-037.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-037.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-036'(suite) -> [];
 'valid-sa-036'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-036.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-036.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-035'(suite) -> [];
 'valid-sa-035'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-035.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-035.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-034'(suite) -> [];
 'valid-sa-034'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-034.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-034.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-033'(suite) -> [];
 'valid-sa-033'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-033.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-033.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-032'(suite) -> [];
 'valid-sa-032'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-032.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-032.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-031'(suite) -> [];
 'valid-sa-031'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-031.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-031.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-030'(suite) -> [];
 'valid-sa-030'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-030.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-030.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-029'(suite) -> [];
 'valid-sa-029'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-029.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-029.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-028'(suite) -> [];
 'valid-sa-028'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-028.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-028.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-027'(suite) -> [];
 'valid-sa-027'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-027.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-027.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-026'(suite) -> [];
 'valid-sa-026'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-026.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-026.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-025'(suite) -> [];
 'valid-sa-025'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-025.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-025.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-024'(suite) -> [];
 'valid-sa-024'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-024.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-024.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-023'(suite) -> [];
 'valid-sa-023'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-023.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-023.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-022'(suite) -> [];
 'valid-sa-022'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-022.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-022.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-021'(suite) -> [];
 'valid-sa-021'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-021.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-021.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-020'(suite) -> [];
 'valid-sa-020'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-020.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-020.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-019'(suite) -> [];
 'valid-sa-019'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-019.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-019.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-018'(suite) -> [];
 'valid-sa-018'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-018.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-018.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-017'(suite) -> [];
 'valid-sa-017'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-017.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-017.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-016'(suite) -> [];
 'valid-sa-016'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-016.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-016.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-015'(suite) -> [];
 'valid-sa-015'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-015.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-015.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-014'(suite) -> [];
 'valid-sa-014'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-014.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-014.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-013'(suite) -> [];
 'valid-sa-013'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-013.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-013.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-012'(suite) -> [];
 'valid-sa-012'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-012.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-012.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-011'(suite) -> [];
 'valid-sa-011'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-011.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-011.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-010'(suite) -> [];
 'valid-sa-010'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-010.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-010.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-009'(suite) -> [];
 'valid-sa-009'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-009.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-009.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-008'(suite) -> [];
 'valid-sa-008'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-008.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-008.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-007'(suite) -> [];
 'valid-sa-007'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-007.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-007.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-006'(suite) -> [];
 'valid-sa-006'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-006.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-006.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-005'(suite) -> [];
 'valid-sa-005'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-005.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-005.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-004'(suite) -> [];
 'valid-sa-004'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-004.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-004.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-003'(suite) -> [];
 'valid-sa-003'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-003.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-003.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-002'(suite) -> [];
 'valid-sa-002'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-002.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-002.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'valid-sa-001'(suite) -> [];
 'valid-sa-001'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"valid-sa-001.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"valid-sa-001.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'invalid-not-sa-022'(suite) -> [];
 'invalid-not-sa-022'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"invalid-not-sa-022.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"invalid-not-sa-022.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'invalid--006'(suite) -> [];
 'invalid--006'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"invalid--006.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"invalid--006.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'invalid--005'(suite) -> [];
 'invalid--005'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"invalid--005.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"invalid--005.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'invalid--002'(suite) -> [];
 'invalid--002'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"invalid--002.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"invalid--002.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-ext-sa-003'(suite) -> [];
 'not-wf-ext-sa-003'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-ext-sa-003.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-ext-sa-003.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-ext-sa-002'(suite) -> [];
 'not-wf-ext-sa-002'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-ext-sa-002.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-ext-sa-002.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-ext-sa-001'(suite) -> [];
 'not-wf-ext-sa-001'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-ext-sa-001.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-ext-sa-001.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-not-sa-009'(suite) -> [];
 'not-wf-not-sa-009'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-009.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-not-sa-009.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-not-sa-008'(suite) -> [];
 'not-wf-not-sa-008'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-008.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-not-sa-008.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-not-sa-007'(suite) -> [];
 'not-wf-not-sa-007'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-007.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-not-sa-007.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-not-sa-006'(suite) -> [];
 'not-wf-not-sa-006'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-006.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-not-sa-006.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-not-sa-005'(suite) -> [];
 'not-wf-not-sa-005'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-005.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-not-sa-005.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-not-sa-004'(suite) -> [];
 'not-wf-not-sa-004'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-004.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-not-sa-004.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-not-sa-003'(suite) -> [];
 'not-wf-not-sa-003'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-003.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-not-sa-003.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-not-sa-002'(suite) -> [];
 'not-wf-not-sa-002'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-002.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-not-sa-002.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-not-sa-001'(suite) -> [];
 'not-wf-not-sa-001'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-not-sa-001.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-not-sa-001.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-186'(suite) -> [];
 'not-wf-sa-186'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-186.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-186.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-185'(suite) -> [];
 'not-wf-sa-185'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-185.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-185.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-184'(suite) -> [];
 'not-wf-sa-184'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-184.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-184.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-183'(suite) -> [];
 'not-wf-sa-183'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-183.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-183.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-182'(suite) -> [];
 'not-wf-sa-182'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-182.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-182.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-181'(suite) -> [];
 'not-wf-sa-181'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-181.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-181.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-180'(suite) -> [];
 'not-wf-sa-180'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-180.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-180.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-179'(suite) -> [];
 'not-wf-sa-179'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-179.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-179.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-178'(suite) -> [];
 'not-wf-sa-178'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-178.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-178.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-177'(suite) -> [];
 'not-wf-sa-177'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-177.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-177.xml"]),[]),
 %  xmerl:export([A],xmerl_test).
     {skip,["do not support UTF-8 (only Latin-1), therefore not ","able to check the illegal FFFF/FFFE (Unicode) characters"]}.
 
 'not-wf-sa-176'(suite) -> [];
 'not-wf-sa-176'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-176.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-176.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-175'(suite) -> [];
 'not-wf-sa-175'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-175.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-175.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["do not support UTF-8 (only Latin-1), therefore not ","able to check the illegal FFFF/FFFE (Unicode) characters"]}.
 
 'not-wf-sa-174'(suite) -> [];
 'not-wf-sa-174'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-174.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-174.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["do not support UTF-8 (only Latin-1), therefore not ","able to check the illegal FFFF/FFFE (Unicode) characters"]}.
 
 'not-wf-sa-173'(suite) -> [];
 'not-wf-sa-173'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-173.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-173.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["do not support UTF-8 (only Latin-1), therefore not ","able to check the illegal FFFF/FFFE (Unicode) characters"]}.
 
 'not-wf-sa-172'(suite) -> [];
 'not-wf-sa-172'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-172.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-172.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["do not support UTF-8 (only Latin-1), therefore not ","able to check the illegal FFFF/FFFE (Unicode) characters"]}.
 
 'not-wf-sa-171'(suite) -> [];
 'not-wf-sa-171'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-171.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-171.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["do not support UTF-8 (only Latin-1), therefore not ","able to check the illegal FFFF/FFFE (Unicode) characters"]}.
 
 'not-wf-sa-170'(suite) -> [];
 'not-wf-sa-170'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-170.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-170.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["UTF-8 encoding of UCS-4 characters"]}.
 
 'not-wf-sa-169'(suite) -> [];
 'not-wf-sa-169'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-169.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-169.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["UTF-8 encoding of an illegal unpaired surrogate (DC00)"]}.
 
 'not-wf-sa-168'(suite) -> [];
 'not-wf-sa-168'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-168.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-168.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["UTF-8 encoding of an illegal unpaired surrogate (D800)"]}.
 
 'not-wf-sa-167'(suite) -> [];
 'not-wf-sa-167'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-167.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-167.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["UTF-8 encoding of an illegal FFFE"]}.
 
 'not-wf-sa-166'(suite) -> [];
 'not-wf-sa-166'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-166.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-166.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["UTF-8 encoding of an illegal FFFE"]}.
 
 'not-wf-sa-165'(suite) -> [];
 'not-wf-sa-165'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-165.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-165.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-164'(suite) -> [];
 'not-wf-sa-164'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-164.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-164.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-163'(suite) -> [];
 'not-wf-sa-163'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-163.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-163.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-162'(suite) -> [];
 'not-wf-sa-162'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-162.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-162.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-161'(suite) -> [];
 'not-wf-sa-161'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-161.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-161.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-160'(suite) -> [];
 'not-wf-sa-160'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-160.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-160.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-159'(suite) -> [];
 'not-wf-sa-159'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-159.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-159.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-158'(suite) -> [];
 'not-wf-sa-158'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-158.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-158.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-157'(suite) -> [];
 'not-wf-sa-157'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-157.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-157.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-156'(suite) -> [];
 'not-wf-sa-156'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-156.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-156.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-155'(suite) -> [];
 'not-wf-sa-155'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-155.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-155.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-154'(suite) -> [];
 'not-wf-sa-154'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-154.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-154.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-153'(suite) -> [];
 'not-wf-sa-153'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-153.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-153.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-152'(suite) -> [];
 'not-wf-sa-152'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-152.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-152.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-151'(suite) -> [];
 'not-wf-sa-151'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-151.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-151.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["don't bother wath's in the Misc production"]}.
 
 'not-wf-sa-150'(suite) -> [];
 'not-wf-sa-150'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-150.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-150.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-149'(suite) -> [];
 'not-wf-sa-149'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-149.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-149.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-148'(suite) -> [];
 'not-wf-sa-148'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-148.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-148.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-147'(suite) -> [];
 'not-wf-sa-147'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-147.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-147.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-146'(suite) -> [];
 'not-wf-sa-146'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-146.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-146.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-145'(suite) -> [];
 'not-wf-sa-145'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-145.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-145.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-144'(suite) -> [];
 'not-wf-sa-144'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-144.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-144.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-143'(suite) -> [];
 'not-wf-sa-143'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-143.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-143.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-142'(suite) -> [];
 'not-wf-sa-142'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-142.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-142.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-141'(suite) -> [];
 'not-wf-sa-141'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-141.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-141.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-140'(suite) -> [];
 'not-wf-sa-140'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-140.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-140.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-139'(suite) -> [];
 'not-wf-sa-139'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-139.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-139.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-138'(suite) -> [];
 'not-wf-sa-138'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-138.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-138.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-137'(suite) -> [];
 'not-wf-sa-137'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-137.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-137.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-136'(suite) -> [];
 'not-wf-sa-136'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-136.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-136.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-135'(suite) -> [];
 'not-wf-sa-135'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-135.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-135.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-134'(suite) -> [];
 'not-wf-sa-134'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-134.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-134.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-133'(suite) -> [];
 'not-wf-sa-133'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-133.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-133.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-132'(suite) -> [];
 'not-wf-sa-132'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-132.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-132.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-131'(suite) -> [];
 'not-wf-sa-131'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-131.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-131.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-130'(suite) -> [];
 'not-wf-sa-130'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-130.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-130.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-129'(suite) -> [];
 'not-wf-sa-129'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-129.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-129.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-128'(suite) -> [];
 'not-wf-sa-128'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-128.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-128.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-127'(suite) -> [];
 'not-wf-sa-127'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-127.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-127.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-126'(suite) -> [];
 'not-wf-sa-126'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-126.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-126.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-125'(suite) -> [];
 'not-wf-sa-125'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-125.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-125.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-124'(suite) -> [];
 'not-wf-sa-124'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-124.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-124.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-123'(suite) -> [];
 'not-wf-sa-123'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-123.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-123.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-122'(suite) -> [];
 'not-wf-sa-122'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-122.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-122.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-121'(suite) -> [];
 'not-wf-sa-121'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-121.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-121.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-120'(suite) -> [];
 'not-wf-sa-120'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-120.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-120.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-119'(suite) -> [];
 'not-wf-sa-119'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-119.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-119.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-118'(suite) -> [];
 'not-wf-sa-118'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-118.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-118.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-117'(suite) -> [];
 'not-wf-sa-117'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-117.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-117.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-116'(suite) -> [];
 'not-wf-sa-116'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-116.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-116.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-115'(suite) -> [];
 'not-wf-sa-115'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-115.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-115.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-114'(suite) -> [];
 'not-wf-sa-114'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-114.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-114.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-113'(suite) -> [];
 'not-wf-sa-113'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-113.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-113.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-112'(suite) -> [];
 'not-wf-sa-112'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-112.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-112.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-111'(suite) -> [];
 'not-wf-sa-111'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-111.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-111.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-110'(suite) -> [];
 'not-wf-sa-110'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-110.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-110.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-109'(suite) -> [];
 'not-wf-sa-109'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-109.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-109.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-108'(suite) -> [];
 'not-wf-sa-108'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-108.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-108.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-107'(suite) -> [];
 'not-wf-sa-107'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-107.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-107.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-106'(suite) -> [];
 'not-wf-sa-106'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-106.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-106.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-105'(suite) -> [];
 'not-wf-sa-105'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-105.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-105.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-104'(suite) -> [];
 'not-wf-sa-104'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-104.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-104.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-103'(suite) -> [];
 'not-wf-sa-103'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-103.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-103.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-102'(suite) -> [];
 'not-wf-sa-102'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-102.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-102.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-101'(suite) -> [];
 'not-wf-sa-101'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-101.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-101.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-100'(suite) -> [];
 'not-wf-sa-100'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-100.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-100.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-099'(suite) -> [];
 'not-wf-sa-099'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-099.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-099.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-098'(suite) -> [];
 'not-wf-sa-098'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-098.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-098.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-097'(suite) -> [];
 'not-wf-sa-097'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-097.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-097.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-096'(suite) -> [];
 'not-wf-sa-096'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-096.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-096.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-095'(suite) -> [];
 'not-wf-sa-095'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-095.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-095.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-094'(suite) -> [];
 'not-wf-sa-094'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-094.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-094.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-093'(suite) -> [];
 'not-wf-sa-093'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-093.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-093.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-092'(suite) -> [];
 'not-wf-sa-092'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-092.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-092.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-091'(suite) -> [];
 'not-wf-sa-091'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-091.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-091.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-090'(suite) -> [];
 'not-wf-sa-090'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-090.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-090.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-089'(suite) -> [];
 'not-wf-sa-089'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-089.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-089.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-088'(suite) -> [];
 'not-wf-sa-088'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-088.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-088.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-087'(suite) -> [];
 'not-wf-sa-087'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-087.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-087.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-086'(suite) -> [];
 'not-wf-sa-086'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-086.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-086.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-085'(suite) -> [];
 'not-wf-sa-085'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-085.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-085.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-084'(suite) -> [];
 'not-wf-sa-084'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-084.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-084.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-083'(suite) -> [];
 'not-wf-sa-083'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-083.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-083.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-082'(suite) -> [];
 'not-wf-sa-082'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-082.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-082.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-081'(suite) -> [];
 'not-wf-sa-081'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-081.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-081.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-080'(suite) -> [];
 'not-wf-sa-080'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-080.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-080.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-079'(suite) -> [];
 'not-wf-sa-079'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-079.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-079.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-078'(suite) -> [];
 'not-wf-sa-078'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-078.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-078.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-077'(suite) -> [];
 'not-wf-sa-077'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-077.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-077.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-076'(suite) -> [];
 'not-wf-sa-076'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-076.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-076.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-075'(suite) -> [];
 'not-wf-sa-075'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-075.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-075.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-074'(suite) -> [];
 'not-wf-sa-074'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-074.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-074.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-073'(suite) -> [];
 'not-wf-sa-073'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-073.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-073.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-072'(suite) -> [];
 'not-wf-sa-072'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-072.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-072.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-071'(suite) -> [];
 'not-wf-sa-071'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-071.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-071.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-070'(suite) -> [];
 'not-wf-sa-070'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-070.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-070.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-069'(suite) -> [];
 'not-wf-sa-069'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-069.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-069.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-068'(suite) -> [];
 'not-wf-sa-068'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-068.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-068.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-067'(suite) -> [];
 'not-wf-sa-067'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-067.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-067.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-066'(suite) -> [];
 'not-wf-sa-066'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-066.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-066.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-065'(suite) -> [];
 'not-wf-sa-065'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-065.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-065.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-064'(suite) -> [];
 'not-wf-sa-064'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-064.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-064.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-063'(suite) -> [];
 'not-wf-sa-063'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-063.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-063.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-062'(suite) -> [];
 'not-wf-sa-062'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-062.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-062.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-061'(suite) -> [];
 'not-wf-sa-061'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-061.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-061.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-060'(suite) -> [];
 'not-wf-sa-060'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-060.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-060.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-059'(suite) -> [];
 'not-wf-sa-059'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-059.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-059.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-058'(suite) -> [];
 'not-wf-sa-058'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-058.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-058.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-057'(suite) -> [];
 'not-wf-sa-057'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-057.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-057.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-056'(suite) -> [];
 'not-wf-sa-056'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-056.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-056.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-055'(suite) -> [];
 'not-wf-sa-055'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-055.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-055.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-054'(suite) -> [];
 'not-wf-sa-054'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-054.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-054.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-053'(suite) -> [];
 'not-wf-sa-053'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-053.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-053.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-052'(suite) -> [];
 'not-wf-sa-052'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-052.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-052.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-051'(suite) -> [];
 'not-wf-sa-051'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-051.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-051.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-050'(suite) -> [];
 'not-wf-sa-050'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-050.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-050.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-049'(suite) -> [];
 'not-wf-sa-049'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-049.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-049.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-048'(suite) -> [];
 'not-wf-sa-048'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-048.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-048.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-047'(suite) -> [];
 'not-wf-sa-047'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-047.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-047.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-046'(suite) -> [];
 'not-wf-sa-046'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-046.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-046.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-045'(suite) -> [];
 'not-wf-sa-045'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-045.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-045.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-044'(suite) -> [];
 'not-wf-sa-044'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-044.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-044.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-043'(suite) -> [];
 'not-wf-sa-043'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-043.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-043.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-042'(suite) -> [];
 'not-wf-sa-042'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-042.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-042.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-041'(suite) -> [];
 'not-wf-sa-041'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-041.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-041.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-040'(suite) -> [];
 'not-wf-sa-040'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-040.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-040.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-039'(suite) -> [];
 'not-wf-sa-039'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-039.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-039.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-038'(suite) -> [];
 'not-wf-sa-038'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-038.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-038.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-037'(suite) -> [];
 'not-wf-sa-037'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-037.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-037.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-036'(suite) -> [];
 'not-wf-sa-036'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-036.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-036.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-035'(suite) -> [];
 'not-wf-sa-035'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-035.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-035.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-034'(suite) -> [];
 'not-wf-sa-034'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-034.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-034.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-033'(suite) -> [];
 'not-wf-sa-033'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-033.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-033.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-032'(suite) -> [];
 'not-wf-sa-032'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-032.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-032.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-031'(suite) -> [];
 'not-wf-sa-031'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-031.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-031.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-030'(suite) -> [];
 'not-wf-sa-030'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-030.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-030.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-029'(suite) -> [];
 'not-wf-sa-029'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-029.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-029.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-028'(suite) -> [];
 'not-wf-sa-028'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-028.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-028.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-027'(suite) -> [];
 'not-wf-sa-027'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-027.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-027.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-026'(suite) -> [];
 'not-wf-sa-026'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-026.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-026.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-025'(suite) -> [];
 'not-wf-sa-025'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-025.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-025.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-024'(suite) -> [];
 'not-wf-sa-024'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-024.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-024.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-023'(suite) -> [];
 'not-wf-sa-023'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-023.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-023.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-022'(suite) -> [];
 'not-wf-sa-022'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-022.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-022.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-021'(suite) -> [];
 'not-wf-sa-021'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-021.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-021.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-020'(suite) -> [];
 'not-wf-sa-020'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-020.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-020.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-019'(suite) -> [];
 'not-wf-sa-019'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-019.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-019.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-018'(suite) -> [];
 'not-wf-sa-018'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-018.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-018.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-017'(suite) -> [];
 'not-wf-sa-017'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-017.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-017.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-016'(suite) -> [];
 'not-wf-sa-016'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-016.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-016.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-015'(suite) -> [];
 'not-wf-sa-015'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-015.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-015.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-014'(suite) -> [];
 'not-wf-sa-014'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-014.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-014.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-013'(suite) -> [];
 'not-wf-sa-013'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-013.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-013.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-012'(suite) -> [];
 'not-wf-sa-012'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-012.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-012.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-011'(suite) -> [];
 'not-wf-sa-011'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-011.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-011.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-010'(suite) -> [];
 'not-wf-sa-010'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-010.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-010.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-009'(suite) -> [];
 'not-wf-sa-009'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-009.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-009.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-008'(suite) -> [];
 'not-wf-sa-008'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-008.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-008.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-007'(suite) -> [];
 'not-wf-sa-007'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-007.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-007.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-006'(suite) -> [];
 'not-wf-sa-006'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-006.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-006.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-005'(suite) -> [];
 'not-wf-sa-005'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-005.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-005.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-004'(suite) -> [];
 'not-wf-sa-004'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-004.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-004.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-003'(suite) -> [];
 'not-wf-sa-003'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-003.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-003.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-002'(suite) -> [];
 'not-wf-sa-002'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-002.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-002.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'not-wf-sa-001'(suite) -> [];
 'not-wf-sa-001'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),xmltest,"not-wf-sa-001.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[xmltest,"not-wf-sa-001.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 %%----------------------------------------------------------------------
 
 'japanese-weekly-utf-8'(suite) -> [];
 'japanese-weekly-utf-8'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-weekly-utf-8.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[japanese,"japanese-weekly-utf-8.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["UTF-8 encoding of japanese characters"]}.
 
 'japanese-weekly-utf-16'(suite) -> [];
 'japanese-weekly-utf-16'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-weekly-utf-16.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[japanese,"japanese-weekly-utf-16.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["Test support for UTF-16 encoding, and XML names which contain Japanese characters."]}.
 
 'japanese-weekly-shift_jis'(suite) -> [];
 'japanese-weekly-shift_jis'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-weekly-shift_jis.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[japanese,"japanese-weekly-shift_jis.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'japanese-weekly-little'(suite) -> [];
 'japanese-weekly-little'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-weekly-little.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[japanese,"japanese-weekly-little.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["Test support for little-endian UTF-16 encoding, and XML names which contain Japanese characters."]}.
 
 'japanese-weekly-iso-2022-jp'(suite) -> [];
 'japanese-weekly-iso-2022-jp'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-weekly-iso-2022-jp.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[japanese,"japanese-weekly-iso-2022-jp.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'japanese-weekly-euc-jp'(suite) -> [];
 'japanese-weekly-euc-jp'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-weekly-euc-jp.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[japanese,"japanese-weekly-euc-jp.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'japanese-pr-xml-utf-8'(suite) -> [];
 'japanese-pr-xml-utf-8'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-pr-xml-utf-8.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[japanese,"japanese-pr-xml-utf-8.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["Test support for UTF-8 text which relies on Japanese characters"]}.
 
 'japanese-pr-xml-utf-16'(suite) -> [];
 'japanese-pr-xml-utf-16'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-pr-xml-utf-16.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[japanese,"japanese-pr-xml-utf-16.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["Test support UTF-16 text which relies on Japanese characters."]}.
 
 'japanese-pr-xml-shift_jis'(suite) -> [];
 'japanese-pr-xml-shift_jis'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-pr-xml-shift_jis.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[japanese,"japanese-pr-xml-shift_jis.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'japanese-pr-xml-little'(suite) -> [];
 'japanese-pr-xml-little'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-pr-xml-little.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[japanese,"japanese-pr-xml-little.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["Test support for little-endian UTF-16 text which relies on Japanese characters."]}.
 
 'japanese-pr-xml-iso-2022-jp'(suite) -> [];
 'japanese-pr-xml-iso-2022-jp'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-pr-xml-iso-2022-jp.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[japanese,"japanese-pr-xml-iso-2022-jp.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'japanese-pr-xml-euc-jp'(suite) -> [];
 'japanese-pr-xml-euc-jp'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),japanese,"japanese-pr-xml-euc-jp.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[japanese,"japanese-pr-xml-euc-jp.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 %%----------------------------------------------------------------------
 
 'o-p11pass1'(suite) -> [];
 'o-p11pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p11pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p11pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p76fail4'(suite) -> [];
 'o-p76fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p76fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p76fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p76fail3'(suite) -> [];
 'o-p76fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p76fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p76fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p76fail2'(suite) -> [];
 'o-p76fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p76fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p76fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p76fail1'(suite) -> [];
 'o-p76fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p76fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p76fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p75fail6'(suite) -> [];
 'o-p75fail6'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p75fail6.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p75fail6.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p75fail5'(suite) -> [];
 'o-p75fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p75fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p75fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p75fail4'(suite) -> [];
 'o-p75fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p75fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p75fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p75fail3'(suite) -> [];
 'o-p75fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p75fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p75fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p75fail2'(suite) -> [];
 'o-p75fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p75fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p75fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p75fail1'(suite) -> [];
 'o-p75fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p75fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p75fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p74fail3'(suite) -> [];
 'o-p74fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p74fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p74fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p74fail2'(suite) -> [];
 'o-p74fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p74fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p74fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p74fail1'(suite) -> [];
 'o-p74fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p74fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p74fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p73fail5'(suite) -> [];
 'o-p73fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p73fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p73fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p73fail4'(suite) -> [];
 'o-p73fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p73fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p73fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p73fail3'(suite) -> [];
 'o-p73fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p73fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p73fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p73fail2'(suite) -> [];
 'o-p73fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p73fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p73fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p73fail1'(suite) -> [];
 'o-p73fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p73fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p73fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p72fail4'(suite) -> [];
 'o-p72fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p72fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p72fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p72fail3'(suite) -> [];
 'o-p72fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p72fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p72fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p72fail2'(suite) -> [];
 'o-p72fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p72fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p72fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p72fail1'(suite) -> [];
 'o-p72fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p72fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p72fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p71fail4'(suite) -> [];
 'o-p71fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p71fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p71fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p71fail3'(suite) -> [];
 'o-p71fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p71fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p71fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p71fail2'(suite) -> [];
 'o-p71fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p71fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p71fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p71fail1'(suite) -> [];
 'o-p71fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p71fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p71fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p70fail1'(suite) -> [];
 'o-p70fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p70fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p70fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p69fail3'(suite) -> [];
 'o-p69fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p69fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p69fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p69fail2'(suite) -> [];
 'o-p69fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p69fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p69fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p69fail1'(suite) -> [];
 'o-p69fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p69fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p69fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p68fail3'(suite) -> [];
 'o-p68fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p68fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p68fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p68fail2'(suite) -> [];
 'o-p68fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p68fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p68fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p68fail1'(suite) -> [];
 'o-p68fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p68fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p68fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p66fail6'(suite) -> [];
 'o-p66fail6'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p66fail6.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p66fail6.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p66fail5'(suite) -> [];
 'o-p66fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p66fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p66fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p66fail4'(suite) -> [];
 'o-p66fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p66fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p66fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p66fail3'(suite) -> [];
 'o-p66fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p66fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p66fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p66fail2'(suite) -> [];
 'o-p66fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p66fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p66fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p66fail1'(suite) -> [];
 'o-p66fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p66fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p66fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p64fail2'(suite) -> [];
 'o-p64fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p64fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p64fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p64fail1'(suite) -> [];
 'o-p64fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p64fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p64fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p63fail2'(suite) -> [];
 'o-p63fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p63fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p63fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p63fail1'(suite) -> [];
 'o-p63fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p63fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p63fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p62fail2'(suite) -> [];
 'o-p62fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p62fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p62fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p62fail1'(suite) -> [];
 'o-p62fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p62fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p62fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p61fail1'(suite) -> [];
 'o-p61fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p61fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p61fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p60fail5'(suite) -> [];
 'o-p60fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p60fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p60fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p60fail4'(suite) -> [];
 'o-p60fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p60fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p60fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p60fail3'(suite) -> [];
 'o-p60fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p60fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p60fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p60fail2'(suite) -> [];
 'o-p60fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p60fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p60fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p60fail1'(suite) -> [];
 'o-p60fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p60fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p60fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p59fail3'(suite) -> [];
 'o-p59fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p59fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p59fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p59fail2'(suite) -> [];
 'o-p59fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p59fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p59fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p59fail1'(suite) -> [];
 'o-p59fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p59fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p59fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p58fail8'(suite) -> [];
 'o-p58fail8'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail8.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p58fail8.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p58fail7'(suite) -> [];
 'o-p58fail7'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail7.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p58fail7.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p58fail6'(suite) -> [];
 'o-p58fail6'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail6.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p58fail6.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p58fail5'(suite) -> [];
 'o-p58fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p58fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p58fail4'(suite) -> [];
 'o-p58fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p58fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p58fail3'(suite) -> [];
 'o-p58fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p58fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p58fail2'(suite) -> [];
 'o-p58fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p58fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p58fail1'(suite) -> [];
 'o-p58fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p58fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p57fail1'(suite) -> [];
 'o-p57fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p57fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p57fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p56fail5'(suite) -> [];
 'o-p56fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p56fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p56fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p56fail4'(suite) -> [];
 'o-p56fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p56fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p56fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p56fail3'(suite) -> [];
 'o-p56fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p56fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p56fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p56fail2'(suite) -> [];
 'o-p56fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p56fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p56fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p56fail1'(suite) -> [];
 'o-p56fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p56fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p56fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p55fail1'(suite) -> [];
 'o-p55fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p55fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p55fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p54fail1'(suite) -> [];
 'o-p54fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p54fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p54fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p53fail5'(suite) -> [];
 'o-p53fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p53fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p53fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p53fail4'(suite) -> [];
 'o-p53fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p53fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p53fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p53fail3'(suite) -> [];
 'o-p53fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p53fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p53fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p53fail2'(suite) -> [];
 'o-p53fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p53fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p53fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p53fail1'(suite) -> [];
 'o-p53fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p53fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p53fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p52fail2'(suite) -> [];
 'o-p52fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p52fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p52fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p52fail1'(suite) -> [];
 'o-p52fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p52fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p52fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p51fail7'(suite) -> [];
 'o-p51fail7'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51fail7.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p51fail7.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p51fail6'(suite) -> [];
 'o-p51fail6'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51fail6.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p51fail6.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p51fail5'(suite) -> [];
 'o-p51fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p51fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p51fail4'(suite) -> [];
 'o-p51fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p51fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p51fail3'(suite) -> [];
 'o-p51fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p51fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p51fail2'(suite) -> [];
 'o-p51fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p51fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p51fail1'(suite) -> [];
 'o-p51fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p51fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p50fail1'(suite) -> [];
 'o-p50fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p50fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p50fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p49fail1'(suite) -> [];
 'o-p49fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p49fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p49fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p48fail2'(suite) -> [];
 'o-p48fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p48fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p48fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p48fail1'(suite) -> [];
 'o-p48fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p48fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p48fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p47fail4'(suite) -> [];
 'o-p47fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p47fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p47fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p47fail3'(suite) -> [];
 'o-p47fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p47fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p47fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p47fail2'(suite) -> [];
 'o-p47fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p47fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p47fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p47fail1'(suite) -> [];
 'o-p47fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p47fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p47fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p46fail6'(suite) -> [];
 'o-p46fail6'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p46fail6.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p46fail6.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p46fail5'(suite) -> [];
 'o-p46fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p46fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p46fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p46fail4'(suite) -> [];
 'o-p46fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p46fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p46fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p46fail3'(suite) -> [];
 'o-p46fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p46fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p46fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p46fail2'(suite) -> [];
 'o-p46fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p46fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p46fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p46fail1'(suite) -> [];
 'o-p46fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p46fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p46fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p45fail4'(suite) -> [];
 'o-p45fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p45fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p45fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p45fail3'(suite) -> [];
 'o-p45fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p45fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p45fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p45fail2'(suite) -> [];
 'o-p45fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p45fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p45fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p45fail1'(suite) -> [];
 'o-p45fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p45fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p45fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p44fail5'(suite) -> [];
 'o-p44fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p44fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p44fail4'(suite) -> [];
 'o-p44fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p44fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p44fail3'(suite) -> [];
 'o-p44fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p44fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p44fail2'(suite) -> [];
 'o-p44fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p44fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p44fail1'(suite) -> [];
 'o-p44fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p44fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p43fail3'(suite) -> [];
 'o-p43fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p43fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p43fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p43fail2'(suite) -> [];
 'o-p43fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p43fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p43fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p43fail1'(suite) -> [];
 'o-p43fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p43fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p43fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p42fail3'(suite) -> [];
 'o-p42fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p42fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p42fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p42fail2'(suite) -> [];
 'o-p42fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p42fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p42fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p42fail1'(suite) -> [];
 'o-p42fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p42fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p42fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p41fail3'(suite) -> [];
 'o-p41fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p41fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p41fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p41fail2'(suite) -> [];
 'o-p41fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p41fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p41fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p41fail1'(suite) -> [];
 'o-p41fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p41fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p41fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p40fail4'(suite) -> [];
 'o-p40fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p40fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p40fail3'(suite) -> [];
 'o-p40fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p40fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p40fail2'(suite) -> [];
 'o-p40fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p40fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p40fail1'(suite) -> [];
 'o-p40fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p40fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p39fail5'(suite) -> [];
 'o-p39fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p39fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p39fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p39fail4'(suite) -> [];
 'o-p39fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p39fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p39fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p39fail3'(suite) -> [];
 'o-p39fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p39fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p39fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p39fail2'(suite) -> [];
 'o-p39fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p39fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p39fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p39fail1'(suite) -> [];
 'o-p39fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p39fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p39fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p32fail5'(suite) -> [];
 'o-p32fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p32fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p32fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p32fail4'(suite) -> [];
 'o-p32fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p32fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p32fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p32fail3'(suite) -> [];
 'o-p32fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p32fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p32fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p32fail2'(suite) -> [];
 'o-p32fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p32fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p32fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p32fail1'(suite) -> [];
 'o-p32fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p32fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p32fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p31fail1'(suite) -> [];
 'o-p31fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p31fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p31fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p30fail1'(suite) -> [];
 'o-p30fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p30fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p30fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p29fail1'(suite) -> [];
 'o-p29fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p29fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p29fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p28fail1'(suite) -> [];
 'o-p28fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p28fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p28fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p27fail1'(suite) -> [];
 'o-p27fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p27fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p27fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p26fail2'(suite) -> [];
 'o-p26fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p26fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p26fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p26fail1'(suite) -> [];
 'o-p26fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p26fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p26fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p25fail1'(suite) -> [];
 'o-p25fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p25fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p25fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p24fail2'(suite) -> [];
 'o-p24fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p24fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p24fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p24fail1'(suite) -> [];
 'o-p24fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p24fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p24fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p23fail5'(suite) -> [];
 'o-p23fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p23fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p23fail4'(suite) -> [];
 'o-p23fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p23fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p23fail3'(suite) -> [];
 'o-p23fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p23fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p23fail2'(suite) -> [];
 'o-p23fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p23fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p23fail1'(suite) -> [];
 'o-p23fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p23fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p22fail2'(suite) -> [];
 'o-p22fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p22fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p22fail1'(suite) -> [];
 'o-p22fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p22fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p18fail3'(suite) -> [];
 'o-p18fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p18fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p18fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p18fail2'(suite) -> [];
 'o-p18fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p18fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p18fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p18fail1'(suite) -> [];
 'o-p18fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p18fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p18fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p16fail3'(suite) -> [];
 'o-p16fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p16fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p16fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p16fail2'(suite) -> [];
 'o-p16fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p16fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p16fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p16fail1'(suite) -> [];
 'o-p16fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p16fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p16fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p15fail3'(suite) -> [];
 'o-p15fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p15fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p15fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p15fail2'(suite) -> [];
 'o-p15fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p15fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p15fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p15fail1'(suite) -> [];
 'o-p15fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p15fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p15fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p14fail3'(suite) -> [];
 'o-p14fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p14fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p14fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p14fail2'(suite) -> [];
 'o-p14fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p14fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p14fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p14fail1'(suite) -> [];
 'o-p14fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p14fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p14fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p12fail7'(suite) -> [];
 'o-p12fail7'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12fail7.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p12fail7.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p12fail6'(suite) -> [];
 'o-p12fail6'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12fail6.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p12fail6.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p12fail5'(suite) -> [];
 'o-p12fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p12fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p12fail4'(suite) -> [];
 'o-p12fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p12fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p12fail3'(suite) -> [];
 'o-p12fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p12fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p12fail2'(suite) -> [];
 'o-p12fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p12fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p12fail1'(suite) -> [];
 'o-p12fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p12fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p11fail2'(suite) -> [];
 'o-p11fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p11fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p11fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p11fail1'(suite) -> [];
 'o-p11fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p11fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p11fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p10fail3'(suite) -> [];
 'o-p10fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p10fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p10fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p10fail2'(suite) -> [];
 'o-p10fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p10fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p10fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p10fail1'(suite) -> [];
 'o-p10fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p10fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p10fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p09fail5'(suite) -> [];
 'o-p09fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p09fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p09fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p09fail4'(suite) -> [];
 'o-p09fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p09fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p09fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p09fail3'(suite) -> [];
 'o-p09fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p09fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p09fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p09fail2'(suite) -> [];
 'o-p09fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p09fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p09fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p09fail1'(suite) -> [];
 'o-p09fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p09fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p09fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p05fail5'(suite) -> [];
 'o-p05fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p05fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p05fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p05fail4'(suite) -> [];
 'o-p05fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p05fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p05fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p05fail3'(suite) -> [];
 'o-p05fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p05fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p05fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p05fail2'(suite) -> [];
 'o-p05fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p05fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p05fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p05fail1'(suite) -> [];
 'o-p05fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p05fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p05fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p04fail3'(suite) -> [];
 'o-p04fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p04fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p04fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p04fail2'(suite) -> [];
 'o-p04fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p04fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p04fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p04fail1'(suite) -> [];
 'o-p04fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p04fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p04fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail9'(suite) -> [];
 'o-p03fail9'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail9.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail9.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail8'(suite) -> [];
 'o-p03fail8'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail8.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail8.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail7'(suite) -> [];
 'o-p03fail7'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail7.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail7.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail5'(suite) -> [];
 'o-p03fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail4'(suite) -> [];
 'o-p03fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail3'(suite) -> [];
 'o-p03fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail29'(suite) -> [];
 'o-p03fail29'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail29.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail29.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail28'(suite) -> [];
 'o-p03fail28'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail28.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail28.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail27'(suite) -> [];
 'o-p03fail27'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail27.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail27.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail26'(suite) -> [];
 'o-p03fail26'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail26.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail26.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail25'(suite) -> [];
 'o-p03fail25'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail25.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail25.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail24'(suite) -> [];
 'o-p03fail24'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail24.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail24.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail23'(suite) -> [];
 'o-p03fail23'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail23.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail23.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail22'(suite) -> [];
 'o-p03fail22'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail22.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail22.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail21'(suite) -> [];
 'o-p03fail21'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail21.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail21.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail20'(suite) -> [];
 'o-p03fail20'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail20.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail20.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail2'(suite) -> [];
 'o-p03fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail19'(suite) -> [];
 'o-p03fail19'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail19.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail19.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail18'(suite) -> [];
 'o-p03fail18'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail18.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail18.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail17'(suite) -> [];
 'o-p03fail17'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail17.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail17.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail16'(suite) -> [];
 'o-p03fail16'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail16.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail16.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail15'(suite) -> [];
 'o-p03fail15'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail15.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail15.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail14'(suite) -> [];
 'o-p03fail14'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail14.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail14.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail13'(suite) -> [];
 'o-p03fail13'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail13.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail13.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail12'(suite) -> [];
 'o-p03fail12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail11'(suite) -> [];
 'o-p03fail11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail10'(suite) -> [];
 'o-p03fail10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p03fail1'(suite) -> [];
 'o-p03fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail9'(suite) -> [];
 'o-p02fail9'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail9.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail9.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail8'(suite) -> [];
 'o-p02fail8'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail8.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail8.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail7'(suite) -> [];
 'o-p02fail7'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail7.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail7.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail6'(suite) -> [];
 'o-p02fail6'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail6.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail6.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail5'(suite) -> [];
 'o-p02fail5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail4'(suite) -> [];
 'o-p02fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail31'(suite) -> [];
 'o-p02fail31'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail31.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail31.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail30'(suite) -> [];
 'o-p02fail30'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail30.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail30.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail3'(suite) -> [];
 'o-p02fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail29'(suite) -> [];
 'o-p02fail29'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail29.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail29.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail28'(suite) -> [];
 'o-p02fail28'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail28.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail28.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail27'(suite) -> [];
 'o-p02fail27'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail27.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail27.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail26'(suite) -> [];
 'o-p02fail26'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail26.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail26.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail25'(suite) -> [];
 'o-p02fail25'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail25.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail25.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail24'(suite) -> [];
 'o-p02fail24'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail24.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail24.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail23'(suite) -> [];
 'o-p02fail23'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail23.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail23.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail22'(suite) -> [];
 'o-p02fail22'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail22.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail22.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail21'(suite) -> [];
 'o-p02fail21'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail21.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail21.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail20'(suite) -> [];
 'o-p02fail20'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail20.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail20.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail2'(suite) -> [];
 'o-p02fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail19'(suite) -> [];
 'o-p02fail19'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail19.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail19.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail18'(suite) -> [];
 'o-p02fail18'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail18.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail18.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail17'(suite) -> [];
 'o-p02fail17'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail17.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail17.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail16'(suite) -> [];
 'o-p02fail16'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail16.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail16.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail15'(suite) -> [];
 'o-p02fail15'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail15.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail15.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail14'(suite) -> [];
 'o-p02fail14'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail14.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail14.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail13'(suite) -> [];
 'o-p02fail13'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail13.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail13.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail12'(suite) -> [];
 'o-p02fail12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail11'(suite) -> [];
 'o-p02fail11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail10'(suite) -> [];
 'o-p02fail10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p02fail1'(suite) -> [];
 'o-p02fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p02fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p02fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p01fail4'(suite) -> [];
 'o-p01fail4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p01fail4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p01fail4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p01fail3'(suite) -> [];
 'o-p01fail3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p01fail3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p01fail3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p01fail2'(suite) -> [];
 'o-p01fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p01fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p01fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p01fail1'(suite) -> [];
 'o-p01fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p01fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p01fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-e2'(suite) -> [];
 'o-e2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-e2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-e2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p75pass1'(suite) -> [];
 'o-p75pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p75pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p75pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p74pass1'(suite) -> [];
 'o-p74pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p74pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p74pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p66pass1'(suite) -> [];
 'o-p66pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p66pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p66pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p44pass5'(suite) -> [];
 'o-p44pass5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44pass5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p44pass5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p44pass4'(suite) -> [];
 'o-p44pass4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44pass4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p44pass4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p44pass3'(suite) -> [];
 'o-p44pass3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44pass3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p44pass3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p44pass2'(suite) -> [];
 'o-p44pass2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44pass2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p44pass2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p44pass1'(suite) -> [];
 'o-p44pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p44pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p44pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p42pass2'(suite) -> [];
 'o-p42pass2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p42pass2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p42pass2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p42pass1'(suite) -> [];
 'o-p42pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p42pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p42pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p41pass2'(suite) -> [];
 'o-p41pass2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p41pass2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p41pass2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p41pass1'(suite) -> [];
 'o-p41pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p41pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p41pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p40pass4'(suite) -> [];
 'o-p40pass4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40pass4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p40pass4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p40pass3'(suite) -> [];
 'o-p40pass3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40pass3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p40pass3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p40pass2'(suite) -> [];
 'o-p40pass2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40pass2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p40pass2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p40pass1'(suite) -> [];
 'o-p40pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p40pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p40pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p39pass2'(suite) -> [];
 'o-p39pass2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p39pass2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p39pass2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p39pass1'(suite) -> [];
 'o-p39pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p39pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p39pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p32pass2'(suite) -> [];
 'o-p32pass2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p32pass2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p32pass2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p32pass1'(suite) -> [];
 'o-p32pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p32pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p32pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p27pass4'(suite) -> [];
 'o-p27pass4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p27pass4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p27pass4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p27pass3'(suite) -> [];
 'o-p27pass3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p27pass3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p27pass3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p27pass2'(suite) -> [];
 'o-p27pass2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p27pass2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p27pass2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p27pass1'(suite) -> [];
 'o-p27pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p27pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p27pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p26pass1'(suite) -> [];
 'o-p26pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p26pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p26pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p25pass2'(suite) -> [];
 'o-p25pass2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p25pass2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p25pass2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p25pass1'(suite) -> [];
 'o-p25pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p25pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p25pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p24pass4'(suite) -> [];
 'o-p24pass4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p24pass4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p24pass4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p24pass3'(suite) -> [];
 'o-p24pass3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p24pass3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p24pass3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p24pass2'(suite) -> [];
 'o-p24pass2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p24pass2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p24pass2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p24pass1'(suite) -> [];
 'o-p24pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p24pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p24pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p23pass4'(suite) -> [];
 'o-p23pass4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23pass4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p23pass4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p23pass3'(suite) -> [];
 'o-p23pass3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23pass3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p23pass3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p23pass2'(suite) -> [];
 'o-p23pass2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23pass2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p23pass2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p23pass1'(suite) -> [];
 'o-p23pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p23pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p23pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p22pass3'(suite) -> [];
 'o-p22pass3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22pass3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p22pass3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p22pass2'(suite) -> [];
 'o-p22pass2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22pass2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p22pass2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p22pass1'(suite) -> [];
 'o-p22pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p22pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p18pass1'(suite) -> [];
 'o-p18pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p18pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p18pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p16pass3'(suite) -> [];
 'o-p16pass3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p16pass3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p16pass3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p16pass2'(suite) -> [];
 'o-p16pass2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p16pass2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p16pass2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p16pass1'(suite) -> [];
 'o-p16pass1'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p16pass1.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p16pass1.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["Hard to interpret the meaning of the XML1.0 spec. See section 2.6 and 2.3."]}.
 
 'o-p15pass1'(suite) -> [];
 'o-p15pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p15pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p15pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p14pass1'(suite) -> [];
 'o-p14pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p14pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p14pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p10pass1'(suite) -> [];
 'o-p10pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p10pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p10pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p08fail2'(suite) -> [];
 'o-p08fail2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p08fail2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p08fail2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p08fail1'(suite) -> [];
 'o-p08fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p08fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p08fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p06fail1'(suite) -> [];
 'o-p06fail1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p06fail1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p06fail1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p05pass1'(suite) -> [];
 'o-p05pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p05pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p05pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p04pass1'(suite) -> [];
 'o-p04pass1'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p04pass1.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p04pass1.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["Fails to handle name containing characters > x#ff, since they are converted to atoms"]}.
 'o-p03pass1'(suite) -> [];
 'o-p03pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p03pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p03pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p01pass3'(suite) -> [];
 'o-p01pass3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p01pass3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p01pass3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p01pass1'(suite) -> [];
 'o-p01pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p01pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p01pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p76pass1'(suite) -> [];
 'o-p76pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p76pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p76pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p73pass1'(suite) -> [];
 'o-p73pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p73pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p73pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p72pass1'(suite) -> [];
 'o-p72pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p72pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p72pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p71pass1'(suite) -> [];
 'o-p71pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p71pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p71pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p70pass1'(suite) -> [];
 'o-p70pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p70pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p70pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p69pass1'(suite) -> [];
 'o-p69pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p69pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p69pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p68pass1'(suite) -> [];
 'o-p68pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p68pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p68pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p64pass1'(suite) -> [];
 'o-p64pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p64pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p64pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p63pass1'(suite) -> [];
 'o-p63pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p63pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p63pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p62pass1'(suite) -> [];
 'o-p62pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p62pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p62pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p61pass1'(suite) -> [];
 'o-p61pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p61pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p61pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p60pass1'(suite) -> [];
 'o-p60pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p60pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p60pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p59pass1'(suite) -> [];
 'o-p59pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p59pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p59pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p58pass1'(suite) -> [];
 'o-p58pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p58pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p58pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p57pass1'(suite) -> [];
 'o-p57pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p57pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p57pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p56pass1'(suite) -> [];
 'o-p56pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p56pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p56pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p55pass1'(suite) -> [];
 'o-p55pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p55pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p55pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p54pass1'(suite) -> [];
 'o-p54pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p54pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p54pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p53pass1'(suite) -> [];
 'o-p53pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p53pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p53pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p52pass1'(suite) -> [];
 'o-p52pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p52pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p52pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p51pass1'(suite) -> [];
 'o-p51pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p51pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p51pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p50pass1'(suite) -> [];
 'o-p50pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p50pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p50pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p49pass1'(suite) -> [];
 'o-p49pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p49pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p49pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p48pass1'(suite) -> [];
 'o-p48pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p48pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p48pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p47pass1'(suite) -> [];
 'o-p47pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p47pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p47pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p46pass1'(suite) -> [];
 'o-p46pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p46pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p46pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p45pass1'(suite) -> [];
 'o-p45pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p45pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p45pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p43pass1'(suite) -> [];
 'o-p43pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p43pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p43pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p31pass2'(suite) -> [];
 'o-p31pass2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p31pass2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p31pass2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p31pass1'(suite) -> [];
 'o-p31pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p31pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p31pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p30pass2'(suite) -> [];
 'o-p30pass2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p30pass2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p30pass2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p30pass1'(suite) -> [];
 'o-p30pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p30pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p30pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p29pass1'(suite) -> [];
 'o-p29pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p29pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p29pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p28pass5'(suite) -> [];
 'o-p28pass5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p28pass5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p28pass5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p28pass4'(suite) -> [];
 'o-p28pass4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p28pass4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p28pass4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p28pass3'(suite) -> [];
 'o-p28pass3'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p28pass3.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p28pass3.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p28pass1'(suite) -> [];
 'o-p28pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p28pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p28pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p22pass6'(suite) -> [];
 'o-p22pass6'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22pass6.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p22pass6.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p22pass5'(suite) -> [];
 'o-p22pass5'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22pass5.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p22pass5.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p22pass4'(suite) -> [];
 'o-p22pass4'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p22pass4.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p22pass4.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p12pass1'(suite) -> [];
 'o-p12pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p12pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p12pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p09pass1'(suite) -> [];
 'o-p09pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p09pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p09pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p08pass1'(suite) -> [];
 'o-p08pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p08pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p08pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p07pass1'(suite) -> [];
 'o-p07pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p07pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p07pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p06pass1'(suite) -> [];
 'o-p06pass1'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p06pass1.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p06pass1.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'o-p01pass2'(suite) -> [];
 'o-p01pass2'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),oasis,"o-p01pass2.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[oasis,"o-p01pass2.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 %%----------------------------------------------------------------------
 
 'ibm-invalid-P76-ibm76i01'(suite) -> [];
 'ibm-invalid-P76-ibm76i01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P76-ibm76i01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P76-ibm76i01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P69-ibm69i04'(suite) -> [];
 'ibm-invalid-P69-ibm69i04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P69-ibm69i04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P69-ibm69i04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P69-ibm69i03'(suite) -> [];
 'ibm-invalid-P69-ibm69i03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P69-ibm69i03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P69-ibm69i03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P69-ibm69i02'(suite) -> [];
 'ibm-invalid-P69-ibm69i02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P69-ibm69i02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P69-ibm69i02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P69-ibm69i01'(suite) -> [];
 'ibm-invalid-P69-ibm69i01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P69-ibm69i01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P69-ibm69i01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P68-ibm68i04'(suite) -> [];
 'ibm-invalid-P68-ibm68i04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P68-ibm68i04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P68-ibm68i04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P68-ibm68i03'(suite) -> [];
 'ibm-invalid-P68-ibm68i03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P68-ibm68i03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P68-ibm68i03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P68-ibm68i02'(suite) -> [];
 'ibm-invalid-P68-ibm68i02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P68-ibm68i02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P68-ibm68i02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P68-ibm68i01'(suite) -> [];
 'ibm-invalid-P68-ibm68i01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P68-ibm68i01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P68-ibm68i01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P60-ibm60i04'(suite) -> [];
 'ibm-invalid-P60-ibm60i04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P60-ibm60i04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P60-ibm60i04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P60-ibm60i03'(suite) -> [];
 'ibm-invalid-P60-ibm60i03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P60-ibm60i03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P60-ibm60i03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P60-ibm60i02'(suite) -> [];
 'ibm-invalid-P60-ibm60i02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P60-ibm60i02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P60-ibm60i02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P60-ibm60i01'(suite) -> [];
 'ibm-invalid-P60-ibm60i01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P60-ibm60i01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P60-ibm60i01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P59-ibm59i01'(suite) -> [];
 'ibm-invalid-P59-ibm59i01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P59-ibm59i01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P59-ibm59i01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P58-ibm58i02'(suite) -> [];
 'ibm-invalid-P58-ibm58i02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P58-ibm58i02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P58-ibm58i02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P58-ibm58i01'(suite) -> [];
 'ibm-invalid-P58-ibm58i01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P58-ibm58i01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P58-ibm58i01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i18'(suite) -> [];
 'ibm-invalid-P56-ibm56i18'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i18.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i18.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i17'(suite) -> [];
 'ibm-invalid-P56-ibm56i17'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i17.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i17.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i16'(suite) -> [];
 'ibm-invalid-P56-ibm56i16'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i16.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i16.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i15'(suite) -> [];
 'ibm-invalid-P56-ibm56i15'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i15.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i15.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i14'(suite) -> [];
 'ibm-invalid-P56-ibm56i14'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i14.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i14.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i13'(suite) -> [];
 'ibm-invalid-P56-ibm56i13'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i13.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i13.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i12'(suite) -> [];
 'ibm-invalid-P56-ibm56i12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i11'(suite) -> [];
 'ibm-invalid-P56-ibm56i11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i10'(suite) -> [];
 'ibm-invalid-P56-ibm56i10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i09'(suite) -> [];
 'ibm-invalid-P56-ibm56i09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i08'(suite) -> [];
 'ibm-invalid-P56-ibm56i08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i07'(suite) -> [];
 'ibm-invalid-P56-ibm56i07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i06'(suite) -> [];
 'ibm-invalid-P56-ibm56i06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i05'(suite) -> [];
 'ibm-invalid-P56-ibm56i05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i03'(suite) -> [];
 'ibm-invalid-P56-ibm56i03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i02'(suite) -> [];
 'ibm-invalid-P56-ibm56i02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P56-ibm56i01'(suite) -> [];
 'ibm-invalid-P56-ibm56i01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P56-ibm56i01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P56-ibm56i01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P51-ibm51i03'(suite) -> [];
 'ibm-invalid-P51-ibm51i03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P51-ibm51i03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P51-ibm51i03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P51-ibm51i01'(suite) -> [];
 'ibm-invalid-P51-ibm51i01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P51-ibm51i01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P51-ibm51i01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P50-ibm50i01'(suite) -> [];
 'ibm-invalid-P50-ibm50i01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P50-ibm50i01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P50-ibm50i01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P49-ibm49i01'(suite) -> [];
 'ibm-invalid-P49-ibm49i01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P49-ibm49i01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P49-ibm49i01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P45-ibm45i01'(suite) -> [];
 'ibm-invalid-P45-ibm45i01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P45-ibm45i01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P45-ibm45i01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P41-ibm41i02'(suite) -> [];
 'ibm-invalid-P41-ibm41i02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P41-ibm41i02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P41-ibm41i02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P41-ibm41i01'(suite) -> [];
 'ibm-invalid-P41-ibm41i01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P41-ibm41i01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P41-ibm41i01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P39-ibm39i04'(suite) -> [];
 'ibm-invalid-P39-ibm39i04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P39-ibm39i04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P39-ibm39i04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P39-ibm39i03'(suite) -> [];
 'ibm-invalid-P39-ibm39i03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P39-ibm39i03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P39-ibm39i03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P39-ibm39i02'(suite) -> [];
 'ibm-invalid-P39-ibm39i02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P39-ibm39i02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P39-ibm39i02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P39-ibm39i01'(suite) -> [];
 'ibm-invalid-P39-ibm39i01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P39-ibm39i01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P39-ibm39i01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P32-ibm32i04'(suite) -> [];
 'ibm-invalid-P32-ibm32i04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P32-ibm32i04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P32-ibm32i04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P32-ibm32i03'(suite) -> [];
 'ibm-invalid-P32-ibm32i03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P32-ibm32i03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P32-ibm32i03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P32-ibm32i01'(suite) -> [];
 'ibm-invalid-P32-ibm32i01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P32-ibm32i01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P32-ibm32i01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-invalid-P28-ibm28i01'(suite) -> [];
 'ibm-invalid-P28-ibm28i01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-invalid-P28-ibm28i01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-invalid-P28-ibm28i01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 %%----------------------------------------------------------------------
 
 'ibm-not-wf-P89-ibm89n12'(suite) -> [];
 'ibm-not-wf-P89-ibm89n12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P89-ibm89n12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P89-ibm89n11'(suite) -> [];
 'ibm-not-wf-P89-ibm89n11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P89-ibm89n11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P89-ibm89n10'(suite) -> [];
 'ibm-not-wf-P89-ibm89n10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P89-ibm89n10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P89-ibm89n09'(suite) -> [];
 'ibm-not-wf-P89-ibm89n09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P89-ibm89n09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P89-ibm89n08'(suite) -> [];
 'ibm-not-wf-P89-ibm89n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P89-ibm89n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P89-ibm89n07'(suite) -> [];
 'ibm-not-wf-P89-ibm89n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P89-ibm89n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P89-ibm89n06'(suite) -> [];
 'ibm-not-wf-P89-ibm89n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P89-ibm89n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P89-ibm89n05'(suite) -> [];
 'ibm-not-wf-P89-ibm89n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P89-ibm89n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P89-ibm89n04'(suite) -> [];
 'ibm-not-wf-P89-ibm89n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P89-ibm89n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P89-ibm89n03'(suite) -> [];
 'ibm-not-wf-P89-ibm89n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P89-ibm89n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P89-ibm89n02'(suite) -> [];
 'ibm-not-wf-P89-ibm89n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P89-ibm89n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P89-ibm89n01'(suite) -> [];
 'ibm-not-wf-P89-ibm89n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P89-ibm89n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P89-ibm89n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P88-ibm88n16'(suite) -> [];
 'ibm-not-wf-P88-ibm88n16'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n16.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P88-ibm88n16.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P88-ibm88n15'(suite) -> [];
 'ibm-not-wf-P88-ibm88n15'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n15.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P88-ibm88n15.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P88-ibm88n14'(suite) -> [];
 'ibm-not-wf-P88-ibm88n14'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n14.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P88-ibm88n14.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P88-ibm88n13'(suite) -> [];
 'ibm-not-wf-P88-ibm88n13'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n13.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P88-ibm88n13.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P88-ibm88n12'(suite) -> [];
 'ibm-not-wf-P88-ibm88n12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P88-ibm88n12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P88-ibm88n11'(suite) -> [];
 'ibm-not-wf-P88-ibm88n11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P88-ibm88n11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P88-ibm88n10'(suite) -> [];
 'ibm-not-wf-P88-ibm88n10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P88-ibm88n10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P88-ibm88n09'(suite) -> [];
 'ibm-not-wf-P88-ibm88n09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P88-ibm88n09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P88-ibm88n08'(suite) -> [];
 'ibm-not-wf-P88-ibm88n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P88-ibm88n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P88-ibm88n06'(suite) -> [];
 'ibm-not-wf-P88-ibm88n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P88-ibm88n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P88-ibm88n05'(suite) -> [];
 'ibm-not-wf-P88-ibm88n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P88-ibm88n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P88-ibm88n04'(suite) -> [];
 'ibm-not-wf-P88-ibm88n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P88-ibm88n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P88-ibm88n03'(suite) -> [];
 'ibm-not-wf-P88-ibm88n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P88-ibm88n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P88-ibm88n02'(suite) -> [];
 'ibm-not-wf-P88-ibm88n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P88-ibm88n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P88-ibm88n01'(suite) -> [];
 'ibm-not-wf-P88-ibm88n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P88-ibm88n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P88-ibm88n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n85'(suite) -> [];
 'ibm-not-wf-P87-ibm87n85'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n85.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n85.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n84'(suite) -> [];
 'ibm-not-wf-P87-ibm87n84'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n84.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n84.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n83'(suite) -> [];
 'ibm-not-wf-P87-ibm87n83'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n83.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n83.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n82'(suite) -> [];
 'ibm-not-wf-P87-ibm87n82'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n82.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n82.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n81'(suite) -> [];
 'ibm-not-wf-P87-ibm87n81'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n81.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n81.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n80'(suite) -> [];
 'ibm-not-wf-P87-ibm87n80'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n80.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n80.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n79'(suite) -> [];
 'ibm-not-wf-P87-ibm87n79'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n79.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n79.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n78'(suite) -> [];
 'ibm-not-wf-P87-ibm87n78'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n78.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n78.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n77'(suite) -> [];
 'ibm-not-wf-P87-ibm87n77'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n77.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n77.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n76'(suite) -> [];
 'ibm-not-wf-P87-ibm87n76'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n76.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n76.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n75'(suite) -> [];
 'ibm-not-wf-P87-ibm87n75'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n75.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n75.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n74'(suite) -> [];
 'ibm-not-wf-P87-ibm87n74'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n74.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n74.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n73'(suite) -> [];
 'ibm-not-wf-P87-ibm87n73'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n73.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n73.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n72'(suite) -> [];
 'ibm-not-wf-P87-ibm87n72'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n72.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n72.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n71'(suite) -> [];
 'ibm-not-wf-P87-ibm87n71'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n71.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n71.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n70'(suite) -> [];
 'ibm-not-wf-P87-ibm87n70'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n70.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n70.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n69'(suite) -> [];
 'ibm-not-wf-P87-ibm87n69'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n69.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n69.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n68'(suite) -> [];
 'ibm-not-wf-P87-ibm87n68'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n68.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n68.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n67'(suite) -> [];
 'ibm-not-wf-P87-ibm87n67'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n67.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n67.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n66'(suite) -> [];
 'ibm-not-wf-P87-ibm87n66'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n66.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n66.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n64'(suite) -> [];
 'ibm-not-wf-P87-ibm87n64'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n64.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n64.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n63'(suite) -> [];
 'ibm-not-wf-P87-ibm87n63'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n63.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n63.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n62'(suite) -> [];
 'ibm-not-wf-P87-ibm87n62'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n62.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n62.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n61'(suite) -> [];
 'ibm-not-wf-P87-ibm87n61'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n61.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n61.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n60'(suite) -> [];
 'ibm-not-wf-P87-ibm87n60'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n60.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n60.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n59'(suite) -> [];
 'ibm-not-wf-P87-ibm87n59'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n59.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n59.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n58'(suite) -> [];
 'ibm-not-wf-P87-ibm87n58'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n58.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n58.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n57'(suite) -> [];
 'ibm-not-wf-P87-ibm87n57'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n57.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n57.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n56'(suite) -> [];
 'ibm-not-wf-P87-ibm87n56'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n56.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n56.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n55'(suite) -> [];
 'ibm-not-wf-P87-ibm87n55'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n55.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n55.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n54'(suite) -> [];
 'ibm-not-wf-P87-ibm87n54'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n54.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n54.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n53'(suite) -> [];
 'ibm-not-wf-P87-ibm87n53'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n53.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n53.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n52'(suite) -> [];
 'ibm-not-wf-P87-ibm87n52'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n52.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n52.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n51'(suite) -> [];
 'ibm-not-wf-P87-ibm87n51'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n51.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n51.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n50'(suite) -> [];
 'ibm-not-wf-P87-ibm87n50'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n50.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n50.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n49'(suite) -> [];
 'ibm-not-wf-P87-ibm87n49'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n49.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n49.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n48'(suite) -> [];
 'ibm-not-wf-P87-ibm87n48'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n48.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n48.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n47'(suite) -> [];
 'ibm-not-wf-P87-ibm87n47'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n47.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n47.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n46'(suite) -> [];
 'ibm-not-wf-P87-ibm87n46'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n46.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n46.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n45'(suite) -> [];
 'ibm-not-wf-P87-ibm87n45'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n45.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n45.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n44'(suite) -> [];
 'ibm-not-wf-P87-ibm87n44'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n44.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n44.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n43'(suite) -> [];
 'ibm-not-wf-P87-ibm87n43'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n43.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n43.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n42'(suite) -> [];
 'ibm-not-wf-P87-ibm87n42'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n42.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n42.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n41'(suite) -> [];
 'ibm-not-wf-P87-ibm87n41'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n41.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n41.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n40'(suite) -> [];
 'ibm-not-wf-P87-ibm87n40'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n40.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n40.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n39'(suite) -> [];
 'ibm-not-wf-P87-ibm87n39'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n39.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n39.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n38'(suite) -> [];
 'ibm-not-wf-P87-ibm87n38'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n38.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n38.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n37'(suite) -> [];
 'ibm-not-wf-P87-ibm87n37'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n37.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n37.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n36'(suite) -> [];
 'ibm-not-wf-P87-ibm87n36'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n36.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n36.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n35'(suite) -> [];
 'ibm-not-wf-P87-ibm87n35'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n35.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n35.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n34'(suite) -> [];
 'ibm-not-wf-P87-ibm87n34'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n34.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n34.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n33'(suite) -> [];
 'ibm-not-wf-P87-ibm87n33'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n33.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n33.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n32'(suite) -> [];
 'ibm-not-wf-P87-ibm87n32'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n32.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n32.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n31'(suite) -> [];
 'ibm-not-wf-P87-ibm87n31'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n31.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n31.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n30'(suite) -> [];
 'ibm-not-wf-P87-ibm87n30'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n30.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n30.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n29'(suite) -> [];
 'ibm-not-wf-P87-ibm87n29'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n29.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n29.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n28'(suite) -> [];
 'ibm-not-wf-P87-ibm87n28'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n28.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n28.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n27'(suite) -> [];
 'ibm-not-wf-P87-ibm87n27'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n27.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n27.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n26'(suite) -> [];
 'ibm-not-wf-P87-ibm87n26'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n26.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n26.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n25'(suite) -> [];
 'ibm-not-wf-P87-ibm87n25'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n25.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n25.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n24'(suite) -> [];
 'ibm-not-wf-P87-ibm87n24'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n24.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n24.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n23'(suite) -> [];
 'ibm-not-wf-P87-ibm87n23'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n23.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n23.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n22'(suite) -> [];
 'ibm-not-wf-P87-ibm87n22'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n22.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n22.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n21'(suite) -> [];
 'ibm-not-wf-P87-ibm87n21'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n21.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n21.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n20'(suite) -> [];
 'ibm-not-wf-P87-ibm87n20'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n20.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n20.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n19'(suite) -> [];
 'ibm-not-wf-P87-ibm87n19'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n19.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n19.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n18'(suite) -> [];
 'ibm-not-wf-P87-ibm87n18'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n18.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n18.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n17'(suite) -> [];
 'ibm-not-wf-P87-ibm87n17'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n17.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n17.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n16'(suite) -> [];
 'ibm-not-wf-P87-ibm87n16'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n16.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n16.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n15'(suite) -> [];
 'ibm-not-wf-P87-ibm87n15'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n15.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n15.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n14'(suite) -> [];
 'ibm-not-wf-P87-ibm87n14'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n14.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n14.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n13'(suite) -> [];
 'ibm-not-wf-P87-ibm87n13'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n13.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n13.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n12'(suite) -> [];
 'ibm-not-wf-P87-ibm87n12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n11'(suite) -> [];
 'ibm-not-wf-P87-ibm87n11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n10'(suite) -> [];
 'ibm-not-wf-P87-ibm87n10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n09'(suite) -> [];
 'ibm-not-wf-P87-ibm87n09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n08'(suite) -> [];
 'ibm-not-wf-P87-ibm87n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n07'(suite) -> [];
 'ibm-not-wf-P87-ibm87n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n06'(suite) -> [];
 'ibm-not-wf-P87-ibm87n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n05'(suite) -> [];
 'ibm-not-wf-P87-ibm87n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n04'(suite) -> [];
 'ibm-not-wf-P87-ibm87n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n03'(suite) -> [];
 'ibm-not-wf-P87-ibm87n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n02'(suite) -> [];
 'ibm-not-wf-P87-ibm87n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P87-ibm87n01'(suite) -> [];
 'ibm-not-wf-P87-ibm87n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P87-ibm87n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P87-ibm87n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P86-ibm86n04'(suite) -> [];
 'ibm-not-wf-P86-ibm86n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P86-ibm86n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P86-ibm86n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P86-ibm86n03'(suite) -> [];
 'ibm-not-wf-P86-ibm86n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P86-ibm86n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P86-ibm86n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P86-ibm86n02'(suite) -> [];
 'ibm-not-wf-P86-ibm86n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P86-ibm86n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P86-ibm86n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P86-ibm86n01'(suite) -> [];
 'ibm-not-wf-P86-ibm86n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P86-ibm86n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P86-ibm86n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n99'(suite) -> [];
 'ibm-not-wf-P85-ibm85n99'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n99.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n99.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n98'(suite) -> [];
 'ibm-not-wf-P85-ibm85n98'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n98.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n98.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n97'(suite) -> [];
 'ibm-not-wf-P85-ibm85n97'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n97.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n97.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n96'(suite) -> [];
 'ibm-not-wf-P85-ibm85n96'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n96.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n96.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n95'(suite) -> [];
 'ibm-not-wf-P85-ibm85n95'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n95.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n95.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n94'(suite) -> [];
 'ibm-not-wf-P85-ibm85n94'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n94.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n94.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n93'(suite) -> [];
 'ibm-not-wf-P85-ibm85n93'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n93.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n93.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n92'(suite) -> [];
 'ibm-not-wf-P85-ibm85n92'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n92.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n92.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n91'(suite) -> [];
 'ibm-not-wf-P85-ibm85n91'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n91.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n91.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n90'(suite) -> [];
 'ibm-not-wf-P85-ibm85n90'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n90.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n90.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n89'(suite) -> [];
 'ibm-not-wf-P85-ibm85n89'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n89.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n89.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n88'(suite) -> [];
 'ibm-not-wf-P85-ibm85n88'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n88.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n88.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n87'(suite) -> [];
 'ibm-not-wf-P85-ibm85n87'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n87.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n87.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n86'(suite) -> [];
 'ibm-not-wf-P85-ibm85n86'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n86.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n86.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n85'(suite) -> [];
 'ibm-not-wf-P85-ibm85n85'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n85.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n85.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n84'(suite) -> [];
 'ibm-not-wf-P85-ibm85n84'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n84.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n84.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n83'(suite) -> [];
 'ibm-not-wf-P85-ibm85n83'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n83.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n83.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n82'(suite) -> [];
 'ibm-not-wf-P85-ibm85n82'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n82.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n82.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n81'(suite) -> [];
 'ibm-not-wf-P85-ibm85n81'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n81.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n81.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n80'(suite) -> [];
 'ibm-not-wf-P85-ibm85n80'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n80.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n80.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n79'(suite) -> [];
 'ibm-not-wf-P85-ibm85n79'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n79.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n79.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n78'(suite) -> [];
 'ibm-not-wf-P85-ibm85n78'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n78.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n78.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n77'(suite) -> [];
 'ibm-not-wf-P85-ibm85n77'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n77.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n77.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n76'(suite) -> [];
 'ibm-not-wf-P85-ibm85n76'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n76.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n76.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n75'(suite) -> [];
 'ibm-not-wf-P85-ibm85n75'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n75.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n75.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n74'(suite) -> [];
 'ibm-not-wf-P85-ibm85n74'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n74.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n74.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n73'(suite) -> [];
 'ibm-not-wf-P85-ibm85n73'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n73.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n73.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n72'(suite) -> [];
 'ibm-not-wf-P85-ibm85n72'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n72.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n72.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n71'(suite) -> [];
 'ibm-not-wf-P85-ibm85n71'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n71.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n71.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n70'(suite) -> [];
 'ibm-not-wf-P85-ibm85n70'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n70.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n70.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n69'(suite) -> [];
 'ibm-not-wf-P85-ibm85n69'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n69.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n69.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n68'(suite) -> [];
 'ibm-not-wf-P85-ibm85n68'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n68.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n68.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n67'(suite) -> [];
 'ibm-not-wf-P85-ibm85n67'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n67.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n67.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n66'(suite) -> [];
 'ibm-not-wf-P85-ibm85n66'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n66.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n66.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n65'(suite) -> [];
 'ibm-not-wf-P85-ibm85n65'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n65.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n65.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n64'(suite) -> [];
 'ibm-not-wf-P85-ibm85n64'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n64.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n64.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n63'(suite) -> [];
 'ibm-not-wf-P85-ibm85n63'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n63.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n63.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n62'(suite) -> [];
 'ibm-not-wf-P85-ibm85n62'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n62.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n62.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n61'(suite) -> [];
 'ibm-not-wf-P85-ibm85n61'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n61.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n61.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n60'(suite) -> [];
 'ibm-not-wf-P85-ibm85n60'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n60.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n60.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n59'(suite) -> [];
 'ibm-not-wf-P85-ibm85n59'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n59.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n59.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n58'(suite) -> [];
 'ibm-not-wf-P85-ibm85n58'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n58.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n58.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n57'(suite) -> [];
 'ibm-not-wf-P85-ibm85n57'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n57.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n57.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n56'(suite) -> [];
 'ibm-not-wf-P85-ibm85n56'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n56.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n56.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n55'(suite) -> [];
 'ibm-not-wf-P85-ibm85n55'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n55.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n55.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n54'(suite) -> [];
 'ibm-not-wf-P85-ibm85n54'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n54.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n54.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n53'(suite) -> [];
 'ibm-not-wf-P85-ibm85n53'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n53.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n53.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n52'(suite) -> [];
 'ibm-not-wf-P85-ibm85n52'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n52.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n52.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n51'(suite) -> [];
 'ibm-not-wf-P85-ibm85n51'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n51.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n51.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n50'(suite) -> [];
 'ibm-not-wf-P85-ibm85n50'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n50.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n50.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n49'(suite) -> [];
 'ibm-not-wf-P85-ibm85n49'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n49.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n49.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n48'(suite) -> [];
 'ibm-not-wf-P85-ibm85n48'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n48.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n48.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n47'(suite) -> [];
 'ibm-not-wf-P85-ibm85n47'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n47.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n47.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n46'(suite) -> [];
 'ibm-not-wf-P85-ibm85n46'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n46.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n46.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n45'(suite) -> [];
 'ibm-not-wf-P85-ibm85n45'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n45.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n45.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n44'(suite) -> [];
 'ibm-not-wf-P85-ibm85n44'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n44.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n44.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n43'(suite) -> [];
 'ibm-not-wf-P85-ibm85n43'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n43.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n43.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n42'(suite) -> [];
 'ibm-not-wf-P85-ibm85n42'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n42.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n42.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n41'(suite) -> [];
 'ibm-not-wf-P85-ibm85n41'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n41.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n41.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n40'(suite) -> [];
 'ibm-not-wf-P85-ibm85n40'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n40.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n40.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n39'(suite) -> [];
 'ibm-not-wf-P85-ibm85n39'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n39.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n39.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n38'(suite) -> [];
 'ibm-not-wf-P85-ibm85n38'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n38.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n38.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n37'(suite) -> [];
 'ibm-not-wf-P85-ibm85n37'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n37.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n37.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n36'(suite) -> [];
 'ibm-not-wf-P85-ibm85n36'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n36.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n36.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n35'(suite) -> [];
 'ibm-not-wf-P85-ibm85n35'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n35.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n35.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n34'(suite) -> [];
 'ibm-not-wf-P85-ibm85n34'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n34.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n34.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n33'(suite) -> [];
 'ibm-not-wf-P85-ibm85n33'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n33.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n33.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n32'(suite) -> [];
 'ibm-not-wf-P85-ibm85n32'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n32.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n32.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n31'(suite) -> [];
 'ibm-not-wf-P85-ibm85n31'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n31.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n31.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n30'(suite) -> [];
 'ibm-not-wf-P85-ibm85n30'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n30.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n30.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n29'(suite) -> [];
 'ibm-not-wf-P85-ibm85n29'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n29.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n29.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n28'(suite) -> [];
 'ibm-not-wf-P85-ibm85n28'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n28.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n28.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n27'(suite) -> [];
 'ibm-not-wf-P85-ibm85n27'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n27.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n27.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n26'(suite) -> [];
 'ibm-not-wf-P85-ibm85n26'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n26.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n26.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n25'(suite) -> [];
 'ibm-not-wf-P85-ibm85n25'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n25.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n25.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n24'(suite) -> [];
 'ibm-not-wf-P85-ibm85n24'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n24.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n24.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n23'(suite) -> [];
 'ibm-not-wf-P85-ibm85n23'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n23.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n23.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n22'(suite) -> [];
 'ibm-not-wf-P85-ibm85n22'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n22.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n22.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n21'(suite) -> [];
 'ibm-not-wf-P85-ibm85n21'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n21.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n21.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n20'(suite) -> [];
 'ibm-not-wf-P85-ibm85n20'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n20.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n20.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n198'(suite) -> [];
 'ibm-not-wf-P85-ibm85n198'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n198.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n198.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n197'(suite) -> [];
 'ibm-not-wf-P85-ibm85n197'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n197.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n197.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n196'(suite) -> [];
 'ibm-not-wf-P85-ibm85n196'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n196.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n196.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n195'(suite) -> [];
 'ibm-not-wf-P85-ibm85n195'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n195.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n195.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n194'(suite) -> [];
 'ibm-not-wf-P85-ibm85n194'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n194.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n194.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n193'(suite) -> [];
 'ibm-not-wf-P85-ibm85n193'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n193.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n193.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n192'(suite) -> [];
 'ibm-not-wf-P85-ibm85n192'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n192.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n192.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n191'(suite) -> [];
 'ibm-not-wf-P85-ibm85n191'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n191.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n191.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n190'(suite) -> [];
 'ibm-not-wf-P85-ibm85n190'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n190.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n190.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n19'(suite) -> [];
 'ibm-not-wf-P85-ibm85n19'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n19.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n19.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n189'(suite) -> [];
 'ibm-not-wf-P85-ibm85n189'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n189.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n189.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n188'(suite) -> [];
 'ibm-not-wf-P85-ibm85n188'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n188.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n188.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n187'(suite) -> [];
 'ibm-not-wf-P85-ibm85n187'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n187.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n187.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n186'(suite) -> [];
 'ibm-not-wf-P85-ibm85n186'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n186.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n186.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n185'(suite) -> [];
 'ibm-not-wf-P85-ibm85n185'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n185.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n185.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n184'(suite) -> [];
 'ibm-not-wf-P85-ibm85n184'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n184.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n184.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n183'(suite) -> [];
 'ibm-not-wf-P85-ibm85n183'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n183.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n183.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n182'(suite) -> [];
 'ibm-not-wf-P85-ibm85n182'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n182.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n182.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n181'(suite) -> [];
 'ibm-not-wf-P85-ibm85n181'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n181.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n181.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n180'(suite) -> [];
 'ibm-not-wf-P85-ibm85n180'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n180.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n180.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n18'(suite) -> [];
 'ibm-not-wf-P85-ibm85n18'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n18.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n18.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n179'(suite) -> [];
 'ibm-not-wf-P85-ibm85n179'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n179.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n179.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n178'(suite) -> [];
 'ibm-not-wf-P85-ibm85n178'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n178.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n178.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n177'(suite) -> [];
 'ibm-not-wf-P85-ibm85n177'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n177.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n177.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n176'(suite) -> [];
 'ibm-not-wf-P85-ibm85n176'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n176.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n176.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n175'(suite) -> [];
 'ibm-not-wf-P85-ibm85n175'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n175.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n175.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n174'(suite) -> [];
 'ibm-not-wf-P85-ibm85n174'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n174.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n174.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n173'(suite) -> [];
 'ibm-not-wf-P85-ibm85n173'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n173.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n173.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n172'(suite) -> [];
 'ibm-not-wf-P85-ibm85n172'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n172.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n172.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n171'(suite) -> [];
 'ibm-not-wf-P85-ibm85n171'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n171.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n171.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n170'(suite) -> [];
 'ibm-not-wf-P85-ibm85n170'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n170.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n170.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n17'(suite) -> [];
 'ibm-not-wf-P85-ibm85n17'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n17.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n17.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n169'(suite) -> [];
 'ibm-not-wf-P85-ibm85n169'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n169.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n169.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n168'(suite) -> [];
 'ibm-not-wf-P85-ibm85n168'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n168.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n168.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n167'(suite) -> [];
 'ibm-not-wf-P85-ibm85n167'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n167.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n167.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n166'(suite) -> [];
 'ibm-not-wf-P85-ibm85n166'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n166.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n166.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n165'(suite) -> [];
 'ibm-not-wf-P85-ibm85n165'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n165.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n165.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n164'(suite) -> [];
 'ibm-not-wf-P85-ibm85n164'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n164.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n164.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n163'(suite) -> [];
 'ibm-not-wf-P85-ibm85n163'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n163.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n163.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n162'(suite) -> [];
 'ibm-not-wf-P85-ibm85n162'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n162.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n162.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n161'(suite) -> [];
 'ibm-not-wf-P85-ibm85n161'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n161.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n161.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n160'(suite) -> [];
 'ibm-not-wf-P85-ibm85n160'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n160.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n160.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n16'(suite) -> [];
 'ibm-not-wf-P85-ibm85n16'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n16.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n16.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n159'(suite) -> [];
 'ibm-not-wf-P85-ibm85n159'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n159.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n159.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n158'(suite) -> [];
 'ibm-not-wf-P85-ibm85n158'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n158.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n158.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n157'(suite) -> [];
 'ibm-not-wf-P85-ibm85n157'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n157.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n157.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n156'(suite) -> [];
 'ibm-not-wf-P85-ibm85n156'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n156.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n156.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n155'(suite) -> [];
 'ibm-not-wf-P85-ibm85n155'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n155.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n155.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n154'(suite) -> [];
 'ibm-not-wf-P85-ibm85n154'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n154.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n154.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n153'(suite) -> [];
 'ibm-not-wf-P85-ibm85n153'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n153.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n153.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n152'(suite) -> [];
 'ibm-not-wf-P85-ibm85n152'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n152.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n152.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n151'(suite) -> [];
 'ibm-not-wf-P85-ibm85n151'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n151.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n151.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n150'(suite) -> [];
 'ibm-not-wf-P85-ibm85n150'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n150.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n150.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n15'(suite) -> [];
 'ibm-not-wf-P85-ibm85n15'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n15.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n15.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n149'(suite) -> [];
 'ibm-not-wf-P85-ibm85n149'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n149.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n149.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n148'(suite) -> [];
 'ibm-not-wf-P85-ibm85n148'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n148.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n148.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n147'(suite) -> [];
 'ibm-not-wf-P85-ibm85n147'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n147.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n147.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n146'(suite) -> [];
 'ibm-not-wf-P85-ibm85n146'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n146.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n146.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n145'(suite) -> [];
 'ibm-not-wf-P85-ibm85n145'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n145.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n145.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n144'(suite) -> [];
 'ibm-not-wf-P85-ibm85n144'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n144.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n144.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n143'(suite) -> [];
 'ibm-not-wf-P85-ibm85n143'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n143.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n143.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n142'(suite) -> [];
 'ibm-not-wf-P85-ibm85n142'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n142.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n142.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n141'(suite) -> [];
 'ibm-not-wf-P85-ibm85n141'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n141.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n141.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n140'(suite) -> [];
 'ibm-not-wf-P85-ibm85n140'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n140.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n140.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n14'(suite) -> [];
 'ibm-not-wf-P85-ibm85n14'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n14.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n14.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n139'(suite) -> [];
 'ibm-not-wf-P85-ibm85n139'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n139.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n139.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n138'(suite) -> [];
 'ibm-not-wf-P85-ibm85n138'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n138.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n138.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n137'(suite) -> [];
 'ibm-not-wf-P85-ibm85n137'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n137.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n137.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n136'(suite) -> [];
 'ibm-not-wf-P85-ibm85n136'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n136.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n136.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n135'(suite) -> [];
 'ibm-not-wf-P85-ibm85n135'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n135.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n135.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n134'(suite) -> [];
 'ibm-not-wf-P85-ibm85n134'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n134.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n134.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n133'(suite) -> [];
 'ibm-not-wf-P85-ibm85n133'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n133.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n133.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n132'(suite) -> [];
 'ibm-not-wf-P85-ibm85n132'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n132.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n132.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n131'(suite) -> [];
 'ibm-not-wf-P85-ibm85n131'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n131.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n131.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n130'(suite) -> [];
 'ibm-not-wf-P85-ibm85n130'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n130.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n130.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n13'(suite) -> [];
 'ibm-not-wf-P85-ibm85n13'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n13.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n13.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n129'(suite) -> [];
 'ibm-not-wf-P85-ibm85n129'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n129.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n129.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n128'(suite) -> [];
 'ibm-not-wf-P85-ibm85n128'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n128.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n128.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n127'(suite) -> [];
 'ibm-not-wf-P85-ibm85n127'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n127.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n127.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n126'(suite) -> [];
 'ibm-not-wf-P85-ibm85n126'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n126.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n126.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n125'(suite) -> [];
 'ibm-not-wf-P85-ibm85n125'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n125.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n125.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n124'(suite) -> [];
 'ibm-not-wf-P85-ibm85n124'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n124.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n124.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n123'(suite) -> [];
 'ibm-not-wf-P85-ibm85n123'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n123.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n123.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n122'(suite) -> [];
 'ibm-not-wf-P85-ibm85n122'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n122.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n122.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n121'(suite) -> [];
 'ibm-not-wf-P85-ibm85n121'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n121.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n121.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n120'(suite) -> [];
 'ibm-not-wf-P85-ibm85n120'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n120.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n120.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n12'(suite) -> [];
 'ibm-not-wf-P85-ibm85n12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n119'(suite) -> [];
 'ibm-not-wf-P85-ibm85n119'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n119.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n119.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n118'(suite) -> [];
 'ibm-not-wf-P85-ibm85n118'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n118.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n118.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n117'(suite) -> [];
 'ibm-not-wf-P85-ibm85n117'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n117.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n117.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n116'(suite) -> [];
 'ibm-not-wf-P85-ibm85n116'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n116.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n116.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n115'(suite) -> [];
 'ibm-not-wf-P85-ibm85n115'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n115.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n115.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n114'(suite) -> [];
 'ibm-not-wf-P85-ibm85n114'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n114.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n114.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n113'(suite) -> [];
 'ibm-not-wf-P85-ibm85n113'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n113.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n113.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n112'(suite) -> [];
 'ibm-not-wf-P85-ibm85n112'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n112.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n112.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n111'(suite) -> [];
 'ibm-not-wf-P85-ibm85n111'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n111.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n111.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n110'(suite) -> [];
 'ibm-not-wf-P85-ibm85n110'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n110.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n110.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n11'(suite) -> [];
 'ibm-not-wf-P85-ibm85n11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n109'(suite) -> [];
 'ibm-not-wf-P85-ibm85n109'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n109.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n109.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n108'(suite) -> [];
 'ibm-not-wf-P85-ibm85n108'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n108.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n108.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n107'(suite) -> [];
 'ibm-not-wf-P85-ibm85n107'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n107.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n107.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n106'(suite) -> [];
 'ibm-not-wf-P85-ibm85n106'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n106.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n106.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n105'(suite) -> [];
 'ibm-not-wf-P85-ibm85n105'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n105.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n105.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n104'(suite) -> [];
 'ibm-not-wf-P85-ibm85n104'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n104.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n104.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n103'(suite) -> [];
 'ibm-not-wf-P85-ibm85n103'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n103.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n103.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n102'(suite) -> [];
 'ibm-not-wf-P85-ibm85n102'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n102.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n102.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n101'(suite) -> [];
 'ibm-not-wf-P85-ibm85n101'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n101.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n101.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n100'(suite) -> [];
 'ibm-not-wf-P85-ibm85n100'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n100.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n100.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n10'(suite) -> [];
 'ibm-not-wf-P85-ibm85n10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n09'(suite) -> [];
 'ibm-not-wf-P85-ibm85n09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n08'(suite) -> [];
 'ibm-not-wf-P85-ibm85n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n07'(suite) -> [];
 'ibm-not-wf-P85-ibm85n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n06'(suite) -> [];
 'ibm-not-wf-P85-ibm85n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n05'(suite) -> [];
 'ibm-not-wf-P85-ibm85n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n04'(suite) -> [];
 'ibm-not-wf-P85-ibm85n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n03'(suite) -> [];
 'ibm-not-wf-P85-ibm85n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n02'(suite) -> [];
 'ibm-not-wf-P85-ibm85n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P85-ibm85n01'(suite) -> [];
 'ibm-not-wf-P85-ibm85n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P85-ibm85n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P85-ibm85n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P83-ibm83n06'(suite) -> [];
 'ibm-not-wf-P83-ibm83n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P83-ibm83n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P83-ibm83n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P83-ibm83n05'(suite) -> [];
 'ibm-not-wf-P83-ibm83n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P83-ibm83n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P83-ibm83n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P83-ibm83n04'(suite) -> [];
 'ibm-not-wf-P83-ibm83n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P83-ibm83n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P83-ibm83n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P83-ibm83n03'(suite) -> [];
 'ibm-not-wf-P83-ibm83n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P83-ibm83n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P83-ibm83n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P83-ibm83n02'(suite) -> [];
 'ibm-not-wf-P83-ibm83n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P83-ibm83n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P83-ibm83n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P83-ibm83n01'(suite) -> [];
 'ibm-not-wf-P83-ibm83n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P83-ibm83n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P83-ibm83n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P82-ibm82n08'(suite) -> [];
 'ibm-not-wf-P82-ibm82n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P82-ibm82n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P82-ibm82n07'(suite) -> [];
 'ibm-not-wf-P82-ibm82n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P82-ibm82n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P82-ibm82n06'(suite) -> [];
 'ibm-not-wf-P82-ibm82n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P82-ibm82n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P82-ibm82n05'(suite) -> [];
 'ibm-not-wf-P82-ibm82n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P82-ibm82n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P82-ibm82n04'(suite) -> [];
 'ibm-not-wf-P82-ibm82n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P82-ibm82n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P82-ibm82n03'(suite) -> [];
 'ibm-not-wf-P82-ibm82n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P82-ibm82n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P82-ibm82n02'(suite) -> [];
 'ibm-not-wf-P82-ibm82n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P82-ibm82n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P82-ibm82n01'(suite) -> [];
 'ibm-not-wf-P82-ibm82n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P82-ibm82n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P82-ibm82n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P81-ibm81n09'(suite) -> [];
 'ibm-not-wf-P81-ibm81n09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P81-ibm81n09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P81-ibm81n08'(suite) -> [];
 'ibm-not-wf-P81-ibm81n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P81-ibm81n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P81-ibm81n07'(suite) -> [];
 'ibm-not-wf-P81-ibm81n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P81-ibm81n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P81-ibm81n06'(suite) -> [];
 'ibm-not-wf-P81-ibm81n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P81-ibm81n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P81-ibm81n05'(suite) -> [];
 'ibm-not-wf-P81-ibm81n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P81-ibm81n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P81-ibm81n04'(suite) -> [];
 'ibm-not-wf-P81-ibm81n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P81-ibm81n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P81-ibm81n03'(suite) -> [];
 'ibm-not-wf-P81-ibm81n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P81-ibm81n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P81-ibm81n02'(suite) -> [];
 'ibm-not-wf-P81-ibm81n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P81-ibm81n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P81-ibm81n01'(suite) -> [];
 'ibm-not-wf-P81-ibm81n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P81-ibm81n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P81-ibm81n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P80-ibm80n06'(suite) -> [];
 'ibm-not-wf-P80-ibm80n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P80-ibm80n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P80-ibm80n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P80-ibm80n05'(suite) -> [];
 'ibm-not-wf-P80-ibm80n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P80-ibm80n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P80-ibm80n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P80-ibm80n04'(suite) -> [];
 'ibm-not-wf-P80-ibm80n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P80-ibm80n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P80-ibm80n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P80-ibm80n03'(suite) -> [];
 'ibm-not-wf-P80-ibm80n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P80-ibm80n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P80-ibm80n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P80-ibm80n02'(suite) -> [];
 'ibm-not-wf-P80-ibm80n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P80-ibm80n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P80-ibm80n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P80-ibm80n01'(suite) -> [];
 'ibm-not-wf-P80-ibm80n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P80-ibm80n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P80-ibm80n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P79-ibm79n02'(suite) -> [];
 'ibm-not-wf-P79-ibm79n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P79-ibm79n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P79-ibm79n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P79-ibm79n01'(suite) -> [];
 'ibm-not-wf-P79-ibm79n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P79-ibm79n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P79-ibm79n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P78-ibm78n02'(suite) -> [];
 'ibm-not-wf-P78-ibm78n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P78-ibm78n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P78-ibm78n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P78-ibm78n01'(suite) -> [];
 'ibm-not-wf-P78-ibm78n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P78-ibm78n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P78-ibm78n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P77-ibm77n04'(suite) -> [];
 'ibm-not-wf-P77-ibm77n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P77-ibm77n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P77-ibm77n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P77-ibm77n03'(suite) -> [];
 'ibm-not-wf-P77-ibm77n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P77-ibm77n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P77-ibm77n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P77-ibm77n02'(suite) -> [];
 'ibm-not-wf-P77-ibm77n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P77-ibm77n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P77-ibm77n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P77-ibm77n01'(suite) -> [];
 'ibm-not-wf-P77-ibm77n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P77-ibm77n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P77-ibm77n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P76-ibm76n07'(suite) -> [];
 'ibm-not-wf-P76-ibm76n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P76-ibm76n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P76-ibm76n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P76-ibm76n06'(suite) -> [];
 'ibm-not-wf-P76-ibm76n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P76-ibm76n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P76-ibm76n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P76-ibm76n05'(suite) -> [];
 'ibm-not-wf-P76-ibm76n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P76-ibm76n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P76-ibm76n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P76-ibm76n04'(suite) -> [];
 'ibm-not-wf-P76-ibm76n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P76-ibm76n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P76-ibm76n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P76-ibm76n03'(suite) -> [];
 'ibm-not-wf-P76-ibm76n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P76-ibm76n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P76-ibm76n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P76-ibm76n02'(suite) -> [];
 'ibm-not-wf-P76-ibm76n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P76-ibm76n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P76-ibm76n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P76-ibm76n01'(suite) -> [];
 'ibm-not-wf-P76-ibm76n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P76-ibm76n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P76-ibm76n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P75-ibm75n13'(suite) -> [];
 'ibm-not-wf-P75-ibm75n13'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n13.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P75-ibm75n13.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P75-ibm75n12'(suite) -> [];
 'ibm-not-wf-P75-ibm75n12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P75-ibm75n12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P75-ibm75n11'(suite) -> [];
 'ibm-not-wf-P75-ibm75n11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P75-ibm75n11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P75-ibm75n10'(suite) -> [];
 'ibm-not-wf-P75-ibm75n10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P75-ibm75n10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P75-ibm75n09'(suite) -> [];
 'ibm-not-wf-P75-ibm75n09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P75-ibm75n09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P75-ibm75n08'(suite) -> [];
 'ibm-not-wf-P75-ibm75n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P75-ibm75n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P75-ibm75n07'(suite) -> [];
 'ibm-not-wf-P75-ibm75n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P75-ibm75n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P75-ibm75n06'(suite) -> [];
 'ibm-not-wf-P75-ibm75n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P75-ibm75n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P75-ibm75n05'(suite) -> [];
 'ibm-not-wf-P75-ibm75n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P75-ibm75n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P75-ibm75n04'(suite) -> [];
 'ibm-not-wf-P75-ibm75n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P75-ibm75n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P75-ibm75n03'(suite) -> [];
 'ibm-not-wf-P75-ibm75n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P75-ibm75n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P75-ibm75n02'(suite) -> [];
 'ibm-not-wf-P75-ibm75n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P75-ibm75n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P75-ibm75n01'(suite) -> [];
 'ibm-not-wf-P75-ibm75n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P75-ibm75n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P75-ibm75n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P74-ibm74n01'(suite) -> [];
 'ibm-not-wf-P74-ibm74n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P74-ibm74n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P74-ibm74n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P73-ibm73n03'(suite) -> [];
 'ibm-not-wf-P73-ibm73n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P73-ibm73n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P73-ibm73n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P73-ibm73n01'(suite) -> [];
 'ibm-not-wf-P73-ibm73n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P73-ibm73n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P73-ibm73n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P72-ibm72n09'(suite) -> [];
 'ibm-not-wf-P72-ibm72n09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P72-ibm72n09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P72-ibm72n08'(suite) -> [];
 'ibm-not-wf-P72-ibm72n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P72-ibm72n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P72-ibm72n07'(suite) -> [];
 'ibm-not-wf-P72-ibm72n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P72-ibm72n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P72-ibm72n06'(suite) -> [];
 'ibm-not-wf-P72-ibm72n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P72-ibm72n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P72-ibm72n05'(suite) -> [];
 'ibm-not-wf-P72-ibm72n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P72-ibm72n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P72-ibm72n04'(suite) -> [];
 'ibm-not-wf-P72-ibm72n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P72-ibm72n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P72-ibm72n03'(suite) -> [];
 'ibm-not-wf-P72-ibm72n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P72-ibm72n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P72-ibm72n02'(suite) -> [];
 'ibm-not-wf-P72-ibm72n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P72-ibm72n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P72-ibm72n01'(suite) -> [];
 'ibm-not-wf-P72-ibm72n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P72-ibm72n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P72-ibm72n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P71-ibm71n08'(suite) -> [];
 'ibm-not-wf-P71-ibm71n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P71-ibm71n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P71-ibm71n07'(suite) -> [];
 'ibm-not-wf-P71-ibm71n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P71-ibm71n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P71-ibm71n06'(suite) -> [];
 'ibm-not-wf-P71-ibm71n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P71-ibm71n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P71-ibm71n05'(suite) -> [];
 'ibm-not-wf-P71-ibm71n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P71-ibm71n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P71-ibm71n04'(suite) -> [];
 'ibm-not-wf-P71-ibm71n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P71-ibm71n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P71-ibm71n03'(suite) -> [];
 'ibm-not-wf-P71-ibm71n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P71-ibm71n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P71-ibm71n02'(suite) -> [];
 'ibm-not-wf-P71-ibm71n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P71-ibm71n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P71-ibm71n01'(suite) -> [];
 'ibm-not-wf-P71-ibm71n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm71n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P71-ibm71n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P71-ibm70n01'(suite) -> [];
 'ibm-not-wf-P71-ibm70n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P71-ibm70n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P71-ibm70n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P69-ibm69n07'(suite) -> [];
 'ibm-not-wf-P69-ibm69n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P69-ibm69n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P69-ibm69n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P69-ibm69n06'(suite) -> [];
 'ibm-not-wf-P69-ibm69n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P69-ibm69n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P69-ibm69n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P69-ibm69n05'(suite) -> [];
 'ibm-not-wf-P69-ibm69n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P69-ibm69n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P69-ibm69n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P69-ibm69n04'(suite) -> [];
 'ibm-not-wf-P69-ibm69n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P69-ibm69n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P69-ibm69n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P69-ibm69n03'(suite) -> [];
 'ibm-not-wf-P69-ibm69n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P69-ibm69n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P69-ibm69n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P69-ibm69n02'(suite) -> [];
 'ibm-not-wf-P69-ibm69n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P69-ibm69n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P69-ibm69n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P69-ibm69n01'(suite) -> [];
 'ibm-not-wf-P69-ibm69n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P69-ibm69n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P69-ibm69n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P68-ibm68n10'(suite) -> [];
 'ibm-not-wf-P68-ibm68n10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P68-ibm68n10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P68-ibm68n09'(suite) -> [];
 'ibm-not-wf-P68-ibm68n09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P68-ibm68n09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P68-ibm68n08'(suite) -> [];
 'ibm-not-wf-P68-ibm68n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P68-ibm68n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P68-ibm68n07'(suite) -> [];
 'ibm-not-wf-P68-ibm68n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P68-ibm68n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P68-ibm68n06'(suite) -> [];
 'ibm-not-wf-P68-ibm68n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P68-ibm68n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P68-ibm68n05'(suite) -> [];
 'ibm-not-wf-P68-ibm68n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P68-ibm68n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P68-ibm68n04'(suite) -> [];
 'ibm-not-wf-P68-ibm68n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P68-ibm68n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P68-ibm68n03'(suite) -> [];
 'ibm-not-wf-P68-ibm68n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P68-ibm68n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P68-ibm68n02'(suite) -> [];
 'ibm-not-wf-P68-ibm68n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P68-ibm68n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P68-ibm68n01'(suite) -> [];
 'ibm-not-wf-P68-ibm68n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P68-ibm68n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P68-ibm68n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P66-ibm66n15'(suite) -> [];
 'ibm-not-wf-P66-ibm66n15'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n15.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P66-ibm66n15.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P66-ibm66n14'(suite) -> [];
 'ibm-not-wf-P66-ibm66n14'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n14.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P66-ibm66n14.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P66-ibm66n13'(suite) -> [];
 'ibm-not-wf-P66-ibm66n13'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n13.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P66-ibm66n13.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P66-ibm66n12'(suite) -> [];
 'ibm-not-wf-P66-ibm66n12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P66-ibm66n12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P66-ibm66n11'(suite) -> [];
 'ibm-not-wf-P66-ibm66n11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P66-ibm66n11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P66-ibm66n10'(suite) -> [];
 'ibm-not-wf-P66-ibm66n10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P66-ibm66n10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P66-ibm66n09'(suite) -> [];
 'ibm-not-wf-P66-ibm66n09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P66-ibm66n09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P66-ibm66n08'(suite) -> [];
 'ibm-not-wf-P66-ibm66n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P66-ibm66n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P66-ibm66n07'(suite) -> [];
 'ibm-not-wf-P66-ibm66n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P66-ibm66n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P66-ibm66n06'(suite) -> [];
 'ibm-not-wf-P66-ibm66n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P66-ibm66n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P66-ibm66n05'(suite) -> [];
 'ibm-not-wf-P66-ibm66n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P66-ibm66n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P66-ibm66n04'(suite) -> [];
 'ibm-not-wf-P66-ibm66n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P66-ibm66n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P66-ibm66n03'(suite) -> [];
 'ibm-not-wf-P66-ibm66n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P66-ibm66n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P66-ibm66n02'(suite) -> [];
 'ibm-not-wf-P66-ibm66n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P66-ibm66n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P66-ibm66n01'(suite) -> [];
 'ibm-not-wf-P66-ibm66n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P66-ibm66n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P66-ibm66n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P65-ibm65n02'(suite) -> [];
 'ibm-not-wf-P65-ibm65n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P65-ibm65n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P65-ibm65n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P65-ibm65n01'(suite) -> [];
 'ibm-not-wf-P65-ibm65n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P65-ibm65n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P65-ibm65n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P64-ibm64n03'(suite) -> [];
 'ibm-not-wf-P64-ibm64n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P64-ibm64n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P64-ibm64n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P64-ibm64n02'(suite) -> [];
 'ibm-not-wf-P64-ibm64n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P64-ibm64n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P64-ibm64n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P64-ibm64n01'(suite) -> [];
 'ibm-not-wf-P64-ibm64n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P64-ibm64n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P64-ibm64n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P63-ibm63n07'(suite) -> [];
 'ibm-not-wf-P63-ibm63n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P63-ibm63n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P63-ibm63n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P63-ibm63n06'(suite) -> [];
 'ibm-not-wf-P63-ibm63n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P63-ibm63n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P63-ibm63n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P63-ibm63n05'(suite) -> [];
 'ibm-not-wf-P63-ibm63n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P63-ibm63n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P63-ibm63n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P63-ibm63n04'(suite) -> [];
 'ibm-not-wf-P63-ibm63n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P63-ibm63n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P63-ibm63n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P63-ibm63n03'(suite) -> [];
 'ibm-not-wf-P63-ibm63n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P63-ibm63n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P63-ibm63n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P63-ibm63n02'(suite) -> [];
 'ibm-not-wf-P63-ibm63n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P63-ibm63n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P63-ibm63n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P63-ibm63n01'(suite) -> [];
 'ibm-not-wf-P63-ibm63n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P63-ibm63n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P63-ibm63n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P62-ibm62n08'(suite) -> [];
 'ibm-not-wf-P62-ibm62n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P62-ibm62n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P62-ibm62n07'(suite) -> [];
 'ibm-not-wf-P62-ibm62n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P62-ibm62n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P62-ibm62n06'(suite) -> [];
 'ibm-not-wf-P62-ibm62n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P62-ibm62n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P62-ibm62n05'(suite) -> [];
 'ibm-not-wf-P62-ibm62n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P62-ibm62n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P62-ibm62n04'(suite) -> [];
 'ibm-not-wf-P62-ibm62n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P62-ibm62n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P62-ibm62n03'(suite) -> [];
 'ibm-not-wf-P62-ibm62n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P62-ibm62n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P62-ibm62n02'(suite) -> [];
 'ibm-not-wf-P62-ibm62n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P62-ibm62n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P62-ibm62n01'(suite) -> [];
 'ibm-not-wf-P62-ibm62n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P62-ibm62n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P62-ibm62n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P61-ibm61n01'(suite) -> [];
 'ibm-not-wf-P61-ibm61n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P61-ibm61n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P61-ibm61n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P60-ibm60n08'(suite) -> [];
 'ibm-not-wf-P60-ibm60n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P60-ibm60n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P60-ibm60n07'(suite) -> [];
 'ibm-not-wf-P60-ibm60n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P60-ibm60n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P60-ibm60n06'(suite) -> [];
 'ibm-not-wf-P60-ibm60n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P60-ibm60n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P60-ibm60n05'(suite) -> [];
 'ibm-not-wf-P60-ibm60n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P60-ibm60n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P60-ibm60n04'(suite) -> [];
 'ibm-not-wf-P60-ibm60n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P60-ibm60n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P60-ibm60n03'(suite) -> [];
 'ibm-not-wf-P60-ibm60n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P60-ibm60n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P60-ibm60n02'(suite) -> [];
 'ibm-not-wf-P60-ibm60n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P60-ibm60n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P60-ibm60n01'(suite) -> [];
 'ibm-not-wf-P60-ibm60n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P60-ibm60n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P60-ibm60n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P59-ibm59n06'(suite) -> [];
 'ibm-not-wf-P59-ibm59n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P59-ibm59n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P59-ibm59n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P59-ibm59n05'(suite) -> [];
 'ibm-not-wf-P59-ibm59n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P59-ibm59n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P59-ibm59n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P59-ibm59n04'(suite) -> [];
 'ibm-not-wf-P59-ibm59n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P59-ibm59n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P59-ibm59n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P59-ibm59n03'(suite) -> [];
 'ibm-not-wf-P59-ibm59n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P59-ibm59n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P59-ibm59n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P59-ibm59n02'(suite) -> [];
 'ibm-not-wf-P59-ibm59n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P59-ibm59n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P59-ibm59n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P59-ibm59n01'(suite) -> [];
 'ibm-not-wf-P59-ibm59n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P59-ibm59n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P59-ibm59n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P58-ibm58n08'(suite) -> [];
 'ibm-not-wf-P58-ibm58n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P58-ibm58n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P58-ibm58n07'(suite) -> [];
 'ibm-not-wf-P58-ibm58n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P58-ibm58n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P58-ibm58n06'(suite) -> [];
 'ibm-not-wf-P58-ibm58n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P58-ibm58n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P58-ibm58n05'(suite) -> [];
 'ibm-not-wf-P58-ibm58n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P58-ibm58n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P58-ibm58n04'(suite) -> [];
 'ibm-not-wf-P58-ibm58n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P58-ibm58n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P58-ibm58n03'(suite) -> [];
 'ibm-not-wf-P58-ibm58n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P58-ibm58n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P58-ibm58n02'(suite) -> [];
 'ibm-not-wf-P58-ibm58n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P58-ibm58n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P58-ibm58n01'(suite) -> [];
 'ibm-not-wf-P58-ibm58n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P58-ibm58n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P58-ibm58n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P57-ibm57n01'(suite) -> [];
 'ibm-not-wf-P57-ibm57n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P57-ibm57n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P57-ibm57n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P56-ibm56n07'(suite) -> [];
 'ibm-not-wf-P56-ibm56n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P56-ibm56n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P56-ibm56n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P56-ibm56n06'(suite) -> [];
 'ibm-not-wf-P56-ibm56n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P56-ibm56n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P56-ibm56n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P56-ibm56n05'(suite) -> [];
 'ibm-not-wf-P56-ibm56n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P56-ibm56n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P56-ibm56n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P56-ibm56n04'(suite) -> [];
 'ibm-not-wf-P56-ibm56n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P56-ibm56n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P56-ibm56n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P56-ibm56n03'(suite) -> [];
 'ibm-not-wf-P56-ibm56n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P56-ibm56n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P56-ibm56n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P56-ibm56n02'(suite) -> [];
 'ibm-not-wf-P56-ibm56n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P56-ibm56n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P56-ibm56n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P56-ibm56n01'(suite) -> [];
 'ibm-not-wf-P56-ibm56n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P56-ibm56n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P56-ibm56n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P55-ibm55n03'(suite) -> [];
 'ibm-not-wf-P55-ibm55n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P55-ibm55n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P55-ibm55n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P55-ibm55n02'(suite) -> [];
 'ibm-not-wf-P55-ibm55n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P55-ibm55n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P55-ibm55n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P55-ibm55n01'(suite) -> [];
 'ibm-not-wf-P55-ibm55n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P55-ibm55n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P55-ibm55n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P54-ibm54n02'(suite) -> [];
 'ibm-not-wf-P54-ibm54n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P54-ibm54n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P54-ibm54n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P54-ibm54n01'(suite) -> [];
 'ibm-not-wf-P54-ibm54n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P54-ibm54n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P54-ibm54n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P53-ibm53n08'(suite) -> [];
 'ibm-not-wf-P53-ibm53n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P53-ibm53n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P53-ibm53n07'(suite) -> [];
 'ibm-not-wf-P53-ibm53n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P53-ibm53n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P53-ibm53n06'(suite) -> [];
 'ibm-not-wf-P53-ibm53n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P53-ibm53n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P53-ibm53n05'(suite) -> [];
 'ibm-not-wf-P53-ibm53n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P53-ibm53n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P53-ibm53n04'(suite) -> [];
 'ibm-not-wf-P53-ibm53n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P53-ibm53n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P53-ibm53n03'(suite) -> [];
 'ibm-not-wf-P53-ibm53n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P53-ibm53n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P53-ibm53n02'(suite) -> [];
 'ibm-not-wf-P53-ibm53n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P53-ibm53n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P53-ibm53n01'(suite) -> [];
 'ibm-not-wf-P53-ibm53n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P53-ibm53n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P53-ibm53n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P52-ibm52n06'(suite) -> [];
 'ibm-not-wf-P52-ibm52n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P52-ibm52n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P52-ibm52n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P52-ibm52n05'(suite) -> [];
 'ibm-not-wf-P52-ibm52n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P52-ibm52n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P52-ibm52n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P52-ibm52n04'(suite) -> [];
 'ibm-not-wf-P52-ibm52n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P52-ibm52n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P52-ibm52n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P52-ibm52n03'(suite) -> [];
 'ibm-not-wf-P52-ibm52n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P52-ibm52n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P52-ibm52n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P52-ibm52n02'(suite) -> [];
 'ibm-not-wf-P52-ibm52n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P52-ibm52n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P52-ibm52n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P52-ibm52n01'(suite) -> [];
 'ibm-not-wf-P52-ibm52n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P52-ibm52n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P52-ibm52n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P51-ibm51n07'(suite) -> [];
 'ibm-not-wf-P51-ibm51n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P51-ibm51n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P51-ibm51n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P51-ibm51n06'(suite) -> [];
 'ibm-not-wf-P51-ibm51n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P51-ibm51n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P51-ibm51n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P51-ibm51n05'(suite) -> [];
 'ibm-not-wf-P51-ibm51n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P51-ibm51n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P51-ibm51n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P51-ibm51n04'(suite) -> [];
 'ibm-not-wf-P51-ibm51n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P51-ibm51n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P51-ibm51n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P51-ibm51n03'(suite) -> [];
 'ibm-not-wf-P51-ibm51n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P51-ibm51n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P51-ibm51n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P51-ibm51n02'(suite) -> [];
 'ibm-not-wf-P51-ibm51n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P51-ibm51n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P51-ibm51n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P51-ibm51n01'(suite) -> [];
 'ibm-not-wf-P51-ibm51n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P51-ibm51n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P51-ibm51n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P50-ibm50n07'(suite) -> [];
 'ibm-not-wf-P50-ibm50n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P50-ibm50n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P50-ibm50n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P50-ibm50n06'(suite) -> [];
 'ibm-not-wf-P50-ibm50n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P50-ibm50n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P50-ibm50n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P50-ibm50n05'(suite) -> [];
 'ibm-not-wf-P50-ibm50n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P50-ibm50n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P50-ibm50n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P50-ibm50n04'(suite) -> [];
 'ibm-not-wf-P50-ibm50n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P50-ibm50n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P50-ibm50n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P50-ibm50n03'(suite) -> [];
 'ibm-not-wf-P50-ibm50n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P50-ibm50n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P50-ibm50n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P50-ibm50n02'(suite) -> [];
 'ibm-not-wf-P50-ibm50n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P50-ibm50n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P50-ibm50n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P50-ibm50n01'(suite) -> [];
 'ibm-not-wf-P50-ibm50n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P50-ibm50n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P50-ibm50n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P49-ibm49n06'(suite) -> [];
 'ibm-not-wf-P49-ibm49n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P49-ibm49n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P49-ibm49n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P49-ibm49n05'(suite) -> [];
 'ibm-not-wf-P49-ibm49n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P49-ibm49n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P49-ibm49n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P49-ibm49n04'(suite) -> [];
 'ibm-not-wf-P49-ibm49n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P49-ibm49n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P49-ibm49n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P49-ibm49n03'(suite) -> [];
 'ibm-not-wf-P49-ibm49n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P49-ibm49n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P49-ibm49n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P49-ibm49n02'(suite) -> [];
 'ibm-not-wf-P49-ibm49n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P49-ibm49n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P49-ibm49n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P49-ibm49n01'(suite) -> [];
 'ibm-not-wf-P49-ibm49n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P49-ibm49n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P49-ibm49n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P48-ibm48n07'(suite) -> [];
 'ibm-not-wf-P48-ibm48n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P48-ibm48n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P48-ibm48n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P48-ibm48n06'(suite) -> [];
 'ibm-not-wf-P48-ibm48n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P48-ibm48n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P48-ibm48n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P48-ibm48n05'(suite) -> [];
 'ibm-not-wf-P48-ibm48n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P48-ibm48n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P48-ibm48n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P48-ibm48n04'(suite) -> [];
 'ibm-not-wf-P48-ibm48n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P48-ibm48n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P48-ibm48n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P48-ibm48n03'(suite) -> [];
 'ibm-not-wf-P48-ibm48n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P48-ibm48n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P48-ibm48n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P48-ibm48n02'(suite) -> [];
 'ibm-not-wf-P48-ibm48n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P48-ibm48n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P48-ibm48n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P48-ibm48n01'(suite) -> [];
 'ibm-not-wf-P48-ibm48n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P48-ibm48n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P48-ibm48n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P47-ibm47n06'(suite) -> [];
 'ibm-not-wf-P47-ibm47n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P47-ibm47n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P47-ibm47n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P47-ibm47n05'(suite) -> [];
 'ibm-not-wf-P47-ibm47n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P47-ibm47n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P47-ibm47n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P47-ibm47n04'(suite) -> [];
 'ibm-not-wf-P47-ibm47n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P47-ibm47n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P47-ibm47n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P47-ibm47n03'(suite) -> [];
 'ibm-not-wf-P47-ibm47n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P47-ibm47n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P47-ibm47n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P47-ibm47n02'(suite) -> [];
 'ibm-not-wf-P47-ibm47n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P47-ibm47n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P47-ibm47n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P47-ibm47n01'(suite) -> [];
 'ibm-not-wf-P47-ibm47n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P47-ibm47n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P47-ibm47n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P46-ibm46n05'(suite) -> [];
 'ibm-not-wf-P46-ibm46n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P46-ibm46n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P46-ibm46n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P46-ibm46n04'(suite) -> [];
 'ibm-not-wf-P46-ibm46n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P46-ibm46n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P46-ibm46n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P46-ibm46n03'(suite) -> [];
 'ibm-not-wf-P46-ibm46n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P46-ibm46n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P46-ibm46n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P46-ibm46n02'(suite) -> [];
 'ibm-not-wf-P46-ibm46n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P46-ibm46n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P46-ibm46n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P46-ibm46n01'(suite) -> [];
 'ibm-not-wf-P46-ibm46n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P46-ibm46n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P46-ibm46n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P45-ibm45n09'(suite) -> [];
 'ibm-not-wf-P45-ibm45n09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P45-ibm45n09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P45-ibm45n08'(suite) -> [];
 'ibm-not-wf-P45-ibm45n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P45-ibm45n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P45-ibm45n07'(suite) -> [];
 'ibm-not-wf-P45-ibm45n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P45-ibm45n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P45-ibm45n06'(suite) -> [];
 'ibm-not-wf-P45-ibm45n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P45-ibm45n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P45-ibm45n05'(suite) -> [];
 'ibm-not-wf-P45-ibm45n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P45-ibm45n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P45-ibm45n04'(suite) -> [];
 'ibm-not-wf-P45-ibm45n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P45-ibm45n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P45-ibm45n03'(suite) -> [];
 'ibm-not-wf-P45-ibm45n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P45-ibm45n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P45-ibm45n02'(suite) -> [];
 'ibm-not-wf-P45-ibm45n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P45-ibm45n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P45-ibm45n01'(suite) -> [];
 'ibm-not-wf-P45-ibm45n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P45-ibm45n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P45-ibm45n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P44-ibm44n04'(suite) -> [];
 'ibm-not-wf-P44-ibm44n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P44-ibm44n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P44-ibm44n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P44-ibm44n03'(suite) -> [];
 'ibm-not-wf-P44-ibm44n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P44-ibm44n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P44-ibm44n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P44-ibm44n02'(suite) -> [];
 'ibm-not-wf-P44-ibm44n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P44-ibm44n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P44-ibm44n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P44-ibm44n01'(suite) -> [];
 'ibm-not-wf-P44-ibm44n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P44-ibm44n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P44-ibm44n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P43-ibm43n05'(suite) -> [];
 'ibm-not-wf-P43-ibm43n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P43-ibm43n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P43-ibm43n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P43-ibm43n04'(suite) -> [];
 'ibm-not-wf-P43-ibm43n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P43-ibm43n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P43-ibm43n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P43-ibm43n02'(suite) -> [];
 'ibm-not-wf-P43-ibm43n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P43-ibm43n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P43-ibm43n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P43-ibm43n01'(suite) -> [];
 'ibm-not-wf-P43-ibm43n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P43-ibm43n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P43-ibm43n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P42-ibm42n05'(suite) -> [];
 'ibm-not-wf-P42-ibm42n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P42-ibm42n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P42-ibm42n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P42-ibm42n04'(suite) -> [];
 'ibm-not-wf-P42-ibm42n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P42-ibm42n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P42-ibm42n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P42-ibm42n03'(suite) -> [];
 'ibm-not-wf-P42-ibm42n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P42-ibm42n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P42-ibm42n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P42-ibm42n02'(suite) -> [];
 'ibm-not-wf-P42-ibm42n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P42-ibm42n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P42-ibm42n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P42-ibm42n01'(suite) -> [];
 'ibm-not-wf-P42-ibm42n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P42-ibm42n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P42-ibm42n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P41-ibm41n14'(suite) -> [];
 'ibm-not-wf-P41-ibm41n14'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n14.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P41-ibm41n14.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P41-ibm41n13'(suite) -> [];
 'ibm-not-wf-P41-ibm41n13'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n13.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P41-ibm41n13.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P41-ibm41n12'(suite) -> [];
 'ibm-not-wf-P41-ibm41n12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P41-ibm41n12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P41-ibm41n11'(suite) -> [];
 'ibm-not-wf-P41-ibm41n11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P41-ibm41n11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P41-ibm41n10'(suite) -> [];
 'ibm-not-wf-P41-ibm41n10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P41-ibm41n10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P41-ibm41n09'(suite) -> [];
 'ibm-not-wf-P41-ibm41n09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P41-ibm41n09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P41-ibm41n08'(suite) -> [];
 'ibm-not-wf-P41-ibm41n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P41-ibm41n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P41-ibm41n07'(suite) -> [];
 'ibm-not-wf-P41-ibm41n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P41-ibm41n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P41-ibm41n06'(suite) -> [];
 'ibm-not-wf-P41-ibm41n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P41-ibm41n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P41-ibm41n05'(suite) -> [];
 'ibm-not-wf-P41-ibm41n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P41-ibm41n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P41-ibm41n04'(suite) -> [];
 'ibm-not-wf-P41-ibm41n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P41-ibm41n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P41-ibm41n03'(suite) -> [];
 'ibm-not-wf-P41-ibm41n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P41-ibm41n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P41-ibm41n02'(suite) -> [];
 'ibm-not-wf-P41-ibm41n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P41-ibm41n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P41-ibm41n01'(suite) -> [];
 'ibm-not-wf-P41-ibm41n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P41-ibm41n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P41-ibm41n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P40-ibm40n05'(suite) -> [];
 'ibm-not-wf-P40-ibm40n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P40-ibm40n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P40-ibm40n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P40-ibm40n04'(suite) -> [];
 'ibm-not-wf-P40-ibm40n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P40-ibm40n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P40-ibm40n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P40-ibm40n03'(suite) -> [];
 'ibm-not-wf-P40-ibm40n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P40-ibm40n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P40-ibm40n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P40-ibm40n02'(suite) -> [];
 'ibm-not-wf-P40-ibm40n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P40-ibm40n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P40-ibm40n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P40-ibm40n01'(suite) -> [];
 'ibm-not-wf-P40-ibm40n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P40-ibm40n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P40-ibm40n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P39-ibm39n06'(suite) -> [];
 'ibm-not-wf-P39-ibm39n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P39-ibm39n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P39-ibm39n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P39-ibm39n05'(suite) -> [];
 'ibm-not-wf-P39-ibm39n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P39-ibm39n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P39-ibm39n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P39-ibm39n04'(suite) -> [];
 'ibm-not-wf-P39-ibm39n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P39-ibm39n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P39-ibm39n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P39-ibm39n03'(suite) -> [];
 'ibm-not-wf-P39-ibm39n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P39-ibm39n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P39-ibm39n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P39-ibm39n02'(suite) -> [];
 'ibm-not-wf-P39-ibm39n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P39-ibm39n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P39-ibm39n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P39-ibm39n01'(suite) -> [];
 'ibm-not-wf-P39-ibm39n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P39-ibm39n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P39-ibm39n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P32-ibm32n09'(suite) -> [];
 'ibm-not-wf-P32-ibm32n09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P32-ibm32n09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P32-ibm32n08'(suite) -> [];
 'ibm-not-wf-P32-ibm32n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P32-ibm32n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P32-ibm32n07'(suite) -> [];
 'ibm-not-wf-P32-ibm32n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P32-ibm32n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P32-ibm32n06'(suite) -> [];
 'ibm-not-wf-P32-ibm32n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P32-ibm32n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P32-ibm32n05'(suite) -> [];
 'ibm-not-wf-P32-ibm32n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P32-ibm32n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P32-ibm32n04'(suite) -> [];
 'ibm-not-wf-P32-ibm32n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P32-ibm32n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P32-ibm32n03'(suite) -> [];
 'ibm-not-wf-P32-ibm32n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P32-ibm32n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P32-ibm32n02'(suite) -> [];
 'ibm-not-wf-P32-ibm32n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P32-ibm32n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P32-ibm32n01'(suite) -> [];
 'ibm-not-wf-P32-ibm32n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P32-ibm32n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P32-ibm32n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P31-ibm31n01'(suite) -> [];
 'ibm-not-wf-P31-ibm31n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P31-ibm31n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P31-ibm31n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P30-ibm30n01'(suite) -> [];
 'ibm-not-wf-P30-ibm30n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P30-ibm30n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P30-ibm30n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P29-ibm29n07'(suite) -> [];
 'ibm-not-wf-P29-ibm29n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P29-ibm29n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P29-ibm29n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P29-ibm29n06'(suite) -> [];
 'ibm-not-wf-P29-ibm29n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P29-ibm29n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P29-ibm29n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P29-ibm29n05'(suite) -> [];
 'ibm-not-wf-P29-ibm29n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P29-ibm29n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P29-ibm29n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P29-ibm29n04'(suite) -> [];
 'ibm-not-wf-P29-ibm29n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P29-ibm29n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P29-ibm29n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P29-ibm29n03'(suite) -> [];
 'ibm-not-wf-P29-ibm29n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P29-ibm29n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P29-ibm29n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P29-ibm29n02'(suite) -> [];
 'ibm-not-wf-P29-ibm29n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P29-ibm29n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P29-ibm29n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P29-ibm29n01'(suite) -> [];
 'ibm-not-wf-P29-ibm29n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P29-ibm29n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P29-ibm29n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P28a-ibm28an01'(suite) -> [];
 'ibm-not-wf-P28a-ibm28an01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28a-ibm28an01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P28a-ibm28an01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P28-ibm28n08'(suite) -> [];
 'ibm-not-wf-P28-ibm28n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P28-ibm28n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P28-ibm28n07'(suite) -> [];
 'ibm-not-wf-P28-ibm28n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P28-ibm28n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P28-ibm28n06'(suite) -> [];
 'ibm-not-wf-P28-ibm28n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P28-ibm28n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P28-ibm28n05'(suite) -> [];
 'ibm-not-wf-P28-ibm28n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P28-ibm28n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P28-ibm28n04'(suite) -> [];
 'ibm-not-wf-P28-ibm28n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P28-ibm28n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P28-ibm28n03'(suite) -> [];
 'ibm-not-wf-P28-ibm28n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P28-ibm28n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P28-ibm28n02'(suite) -> [];
 'ibm-not-wf-P28-ibm28n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P28-ibm28n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P28-ibm28n01'(suite) -> [];
 'ibm-not-wf-P28-ibm28n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P28-ibm28n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P28-ibm28n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P27-ibm27n01'(suite) -> [];
 'ibm-not-wf-P27-ibm27n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P27-ibm27n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P27-ibm27n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P26-ibm26n01'(suite) -> [];
 'ibm-not-wf-P26-ibm26n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P26-ibm26n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P26-ibm26n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P25-ibm25n02'(suite) -> [];
 'ibm-not-wf-P25-ibm25n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P25-ibm25n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P25-ibm25n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P25-ibm25n01'(suite) -> [];
 'ibm-not-wf-P25-ibm25n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P25-ibm25n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P25-ibm25n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P24-ibm24n09'(suite) -> [];
 'ibm-not-wf-P24-ibm24n09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P24-ibm24n09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P24-ibm24n08'(suite) -> [];
 'ibm-not-wf-P24-ibm24n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P24-ibm24n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P24-ibm24n07'(suite) -> [];
 'ibm-not-wf-P24-ibm24n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P24-ibm24n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P24-ibm24n06'(suite) -> [];
 'ibm-not-wf-P24-ibm24n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P24-ibm24n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P24-ibm24n05'(suite) -> [];
 'ibm-not-wf-P24-ibm24n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P24-ibm24n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P24-ibm24n04'(suite) -> [];
 'ibm-not-wf-P24-ibm24n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P24-ibm24n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P24-ibm24n03'(suite) -> [];
 'ibm-not-wf-P24-ibm24n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P24-ibm24n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P24-ibm24n02'(suite) -> [];
 'ibm-not-wf-P24-ibm24n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P24-ibm24n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P24-ibm24n01'(suite) -> [];
 'ibm-not-wf-P24-ibm24n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P24-ibm24n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P24-ibm24n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P23-ibm23n06'(suite) -> [];
 'ibm-not-wf-P23-ibm23n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P23-ibm23n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P23-ibm23n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P23-ibm23n05'(suite) -> [];
 'ibm-not-wf-P23-ibm23n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P23-ibm23n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P23-ibm23n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P23-ibm23n04'(suite) -> [];
 'ibm-not-wf-P23-ibm23n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P23-ibm23n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P23-ibm23n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P23-ibm23n03'(suite) -> [];
 'ibm-not-wf-P23-ibm23n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P23-ibm23n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P23-ibm23n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P23-ibm23n02'(suite) -> [];
 'ibm-not-wf-P23-ibm23n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P23-ibm23n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P23-ibm23n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P23-ibm23n01'(suite) -> [];
 'ibm-not-wf-P23-ibm23n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P23-ibm23n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P23-ibm23n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P22-ibm22n03'(suite) -> [];
 'ibm-not-wf-P22-ibm22n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P22-ibm22n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P22-ibm22n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P22-ibm22n02'(suite) -> [];
 'ibm-not-wf-P22-ibm22n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P22-ibm22n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P22-ibm22n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P22-ibm22n01'(suite) -> [];
 'ibm-not-wf-P22-ibm22n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P22-ibm22n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P22-ibm22n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P21-ibm21n03'(suite) -> [];
 'ibm-not-wf-P21-ibm21n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P21-ibm21n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P21-ibm21n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P21-ibm21n02'(suite) -> [];
 'ibm-not-wf-P21-ibm21n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P21-ibm21n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P21-ibm21n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P21-ibm21n01'(suite) -> [];
 'ibm-not-wf-P21-ibm21n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P21-ibm21n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P21-ibm21n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P20-ibm20n01'(suite) -> [];
 'ibm-not-wf-P20-ibm20n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P20-ibm20n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P20-ibm20n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P19-ibm19n03'(suite) -> [];
 'ibm-not-wf-P19-ibm19n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P19-ibm19n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P19-ibm19n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P19-ibm19n02'(suite) -> [];
 'ibm-not-wf-P19-ibm19n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P19-ibm19n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P19-ibm19n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P19-ibm19n01'(suite) -> [];
 'ibm-not-wf-P19-ibm19n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P19-ibm19n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P19-ibm19n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P18-ibm18n02'(suite) -> [];
 'ibm-not-wf-P18-ibm18n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P18-ibm18n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P18-ibm18n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P18-ibm18n01'(suite) -> [];
 'ibm-not-wf-P18-ibm18n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P18-ibm18n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P18-ibm18n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P17-ibm17n04'(suite) -> [];
 'ibm-not-wf-P17-ibm17n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P17-ibm17n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P17-ibm17n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P17-ibm17n03'(suite) -> [];
 'ibm-not-wf-P17-ibm17n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P17-ibm17n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P17-ibm17n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P17-ibm17n02'(suite) -> [];
 'ibm-not-wf-P17-ibm17n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P17-ibm17n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P17-ibm17n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P17-ibm17n01'(suite) -> [];
 'ibm-not-wf-P17-ibm17n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P17-ibm17n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P17-ibm17n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P16-ibm16n04'(suite) -> [];
 'ibm-not-wf-P16-ibm16n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P16-ibm16n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P16-ibm16n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P16-ibm16n03'(suite) -> [];
 'ibm-not-wf-P16-ibm16n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P16-ibm16n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P16-ibm16n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P16-ibm16n02'(suite) -> [];
 'ibm-not-wf-P16-ibm16n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P16-ibm16n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P16-ibm16n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P16-ibm16n01'(suite) -> [];
 'ibm-not-wf-P16-ibm16n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P16-ibm16n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P16-ibm16n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P15-ibm15n04'(suite) -> [];
 'ibm-not-wf-P15-ibm15n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P15-ibm15n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P15-ibm15n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P15-ibm15n03'(suite) -> [];
 'ibm-not-wf-P15-ibm15n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P15-ibm15n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P15-ibm15n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P15-ibm15n02'(suite) -> [];
 'ibm-not-wf-P15-ibm15n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P15-ibm15n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P15-ibm15n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P15-ibm15n01'(suite) -> [];
 'ibm-not-wf-P15-ibm15n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P15-ibm15n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P15-ibm15n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P14-ibm14n03'(suite) -> [];
 'ibm-not-wf-P14-ibm14n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P14-ibm14n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P14-ibm14n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P14-ibm14n02'(suite) -> [];
 'ibm-not-wf-P14-ibm14n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P14-ibm14n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P14-ibm14n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P14-ibm14n01'(suite) -> [];
 'ibm-not-wf-P14-ibm14n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P14-ibm14n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P14-ibm14n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P13-ibm13n03'(suite) -> [];
 'ibm-not-wf-P13-ibm13n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P13-ibm13n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P13-ibm13n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P13-ibm13n02'(suite) -> [];
 'ibm-not-wf-P13-ibm13n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P13-ibm13n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P13-ibm13n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P13-ibm13n01'(suite) -> [];
 'ibm-not-wf-P13-ibm13n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P13-ibm13n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P13-ibm13n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P12-ibm12n03'(suite) -> [];
 'ibm-not-wf-P12-ibm12n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P12-ibm12n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P12-ibm12n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P12-ibm12n02'(suite) -> [];
 'ibm-not-wf-P12-ibm12n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P12-ibm12n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P12-ibm12n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P12-ibm12n01'(suite) -> [];
 'ibm-not-wf-P12-ibm12n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P12-ibm12n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P12-ibm12n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P11-ibm11n04'(suite) -> [];
 'ibm-not-wf-P11-ibm11n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P11-ibm11n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P11-ibm11n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P11-ibm11n03'(suite) -> [];
 'ibm-not-wf-P11-ibm11n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P11-ibm11n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P11-ibm11n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P11-ibm11n02'(suite) -> [];
 'ibm-not-wf-P11-ibm11n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P11-ibm11n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P11-ibm11n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P11-ibm11n01'(suite) -> [];
 'ibm-not-wf-P11-ibm11n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P11-ibm11n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P11-ibm11n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P10-ibm10n08'(suite) -> [];
 'ibm-not-wf-P10-ibm10n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P10-ibm10n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P10-ibm10n07'(suite) -> [];
 'ibm-not-wf-P10-ibm10n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P10-ibm10n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P10-ibm10n06'(suite) -> [];
 'ibm-not-wf-P10-ibm10n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P10-ibm10n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P10-ibm10n05'(suite) -> [];
 'ibm-not-wf-P10-ibm10n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P10-ibm10n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P10-ibm10n04'(suite) -> [];
 'ibm-not-wf-P10-ibm10n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P10-ibm10n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P10-ibm10n03'(suite) -> [];
 'ibm-not-wf-P10-ibm10n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P10-ibm10n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P10-ibm10n02'(suite) -> [];
 'ibm-not-wf-P10-ibm10n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P10-ibm10n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P10-ibm10n01'(suite) -> [];
 'ibm-not-wf-P10-ibm10n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P10-ibm10n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P10-ibm10n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P09-ibm09n04'(suite) -> [];
 'ibm-not-wf-P09-ibm09n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P09-ibm09n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P09-ibm09n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P09-ibm09n03'(suite) -> [];
 'ibm-not-wf-P09-ibm09n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P09-ibm09n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P09-ibm09n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P09-ibm09n02'(suite) -> [];
 'ibm-not-wf-P09-ibm09n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P09-ibm09n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P09-ibm09n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P09-ibm09n01'(suite) -> [];
 'ibm-not-wf-P09-ibm09n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P09-ibm09n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P09-ibm09n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P05-ibm05n03'(suite) -> [];
 'ibm-not-wf-P05-ibm05n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P05-ibm05n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P05-ibm05n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P05-ibm05n02'(suite) -> [];
 'ibm-not-wf-P05-ibm05n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P05-ibm05n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P05-ibm05n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P05-ibm05n01'(suite) -> [];
 'ibm-not-wf-P05-ibm05n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P05-ibm05n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P05-ibm05n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n18'(suite) -> [];
 'ibm-not-wf-P04-ibm04n18'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n18.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n18.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n17'(suite) -> [];
 'ibm-not-wf-P04-ibm04n17'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n17.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n17.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n16'(suite) -> [];
 'ibm-not-wf-P04-ibm04n16'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n16.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n16.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n15'(suite) -> [];
 'ibm-not-wf-P04-ibm04n15'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n15.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n15.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n14'(suite) -> [];
 'ibm-not-wf-P04-ibm04n14'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n14.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n14.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n13'(suite) -> [];
 'ibm-not-wf-P04-ibm04n13'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n13.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n13.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n12'(suite) -> [];
 'ibm-not-wf-P04-ibm04n12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n11'(suite) -> [];
 'ibm-not-wf-P04-ibm04n11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n10'(suite) -> [];
 'ibm-not-wf-P04-ibm04n10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n09'(suite) -> [];
 'ibm-not-wf-P04-ibm04n09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n08'(suite) -> [];
 'ibm-not-wf-P04-ibm04n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n07'(suite) -> [];
 'ibm-not-wf-P04-ibm04n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n06'(suite) -> [];
 'ibm-not-wf-P04-ibm04n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n05'(suite) -> [];
 'ibm-not-wf-P04-ibm04n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n04'(suite) -> [];
 'ibm-not-wf-P04-ibm04n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n03'(suite) -> [];
 'ibm-not-wf-P04-ibm04n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n02'(suite) -> [];
 'ibm-not-wf-P04-ibm04n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P04-ibm04n01'(suite) -> [];
 'ibm-not-wf-P04-ibm04n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P04-ibm04n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P04-ibm04n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P03-ibm03n01'(suite) -> [];
 'ibm-not-wf-P03-ibm03n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P03-ibm03n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P03-ibm03n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n33'(suite) -> [];
 'ibm-not-wf-P02-ibm02n33'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n33.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n33.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n32'(suite) -> [];
 'ibm-not-wf-P02-ibm02n32'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n32.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n32.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n31'(suite) -> [];
 'ibm-not-wf-P02-ibm02n31'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n31.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n31.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n30'(suite) -> [];
 'ibm-not-wf-P02-ibm02n30'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n30.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n30.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n29'(suite) -> [];
 'ibm-not-wf-P02-ibm02n29'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n29.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n29.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n28'(suite) -> [];
 'ibm-not-wf-P02-ibm02n28'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n28.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n28.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n27'(suite) -> [];
 'ibm-not-wf-P02-ibm02n27'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n27.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n27.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n26'(suite) -> [];
 'ibm-not-wf-P02-ibm02n26'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n26.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n26.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n25'(suite) -> [];
 'ibm-not-wf-P02-ibm02n25'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n25.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n25.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n24'(suite) -> [];
 'ibm-not-wf-P02-ibm02n24'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n24.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n24.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n23'(suite) -> [];
 'ibm-not-wf-P02-ibm02n23'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n23.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n23.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n22'(suite) -> [];
 'ibm-not-wf-P02-ibm02n22'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n22.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n22.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n21'(suite) -> [];
 'ibm-not-wf-P02-ibm02n21'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n21.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n21.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n20'(suite) -> [];
 'ibm-not-wf-P02-ibm02n20'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n20.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n20.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n19'(suite) -> [];
 'ibm-not-wf-P02-ibm02n19'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n19.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n19.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n18'(suite) -> [];
 'ibm-not-wf-P02-ibm02n18'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n18.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n18.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n17'(suite) -> [];
 'ibm-not-wf-P02-ibm02n17'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n17.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n17.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n16'(suite) -> [];
 'ibm-not-wf-P02-ibm02n16'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n16.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n16.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n15'(suite) -> [];
 'ibm-not-wf-P02-ibm02n15'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n15.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n15.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n14'(suite) -> [];
 'ibm-not-wf-P02-ibm02n14'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n14.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n14.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n13'(suite) -> [];
 'ibm-not-wf-P02-ibm02n13'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n13.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n13.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n12'(suite) -> [];
 'ibm-not-wf-P02-ibm02n12'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n12.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n12.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n11'(suite) -> [];
 'ibm-not-wf-P02-ibm02n11'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n11.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n11.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n10'(suite) -> [];
 'ibm-not-wf-P02-ibm02n10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n09'(suite) -> [];
 'ibm-not-wf-P02-ibm02n09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n08'(suite) -> [];
 'ibm-not-wf-P02-ibm02n08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n07'(suite) -> [];
 'ibm-not-wf-P02-ibm02n07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n06'(suite) -> [];
 'ibm-not-wf-P02-ibm02n06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n05'(suite) -> [];
 'ibm-not-wf-P02-ibm02n05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n04'(suite) -> [];
 'ibm-not-wf-P02-ibm02n04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n03'(suite) -> [];
 'ibm-not-wf-P02-ibm02n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n02'(suite) -> [];
 'ibm-not-wf-P02-ibm02n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P02-ibm02n01'(suite) -> [];
 'ibm-not-wf-P02-ibm02n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P02-ibm02n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P02-ibm02n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P01-ibm01n03'(suite) -> [];
 'ibm-not-wf-P01-ibm01n03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P01-ibm01n03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P01-ibm01n03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P01-ibm01n02'(suite) -> [];
 'ibm-not-wf-P01-ibm01n02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P01-ibm01n02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P01-ibm01n02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-not-wf-P01-ibm01n01'(suite) -> [];
 'ibm-not-wf-P01-ibm01n01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-not-wf-P01-ibm01n01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-not-wf-P01-ibm01n01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 %%----------------------------------------------------------------------
 
 'ibm-valid-P89-ibm89v01'(suite) -> [];
 'ibm-valid-P89-ibm89v01'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P89-ibm89v01.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P89-ibm89v01.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["Fails to handle name containing characters > x#ff, since they are converted to atoms"]}.
 
 'ibm-valid-P88-ibm88v01'(suite) -> [];
 'ibm-valid-P88-ibm88v01'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P88-ibm88v01.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P88-ibm88v01.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["Fails to handle name containing characters > x#ff, since they are converted to atoms"]}.
 
 'ibm-valid-P87-ibm87v01'(suite) -> [];
 'ibm-valid-P87-ibm87v01'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P87-ibm87v01.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P87-ibm87v01.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["Fails to handle name containing characters > x#ff, since they are converted to atoms"]}.
 
 'ibm-valid-P86-ibm86v01'(suite) -> [];
 'ibm-valid-P86-ibm86v01'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P86-ibm86v01.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P86-ibm86v01.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["Fails to handle name containing characters > x#ff, since they are converted to atoms"]}.
 
 'ibm-valid-P85-ibm85v01'(suite) -> [];
 'ibm-valid-P85-ibm85v01'(_Config) ->
-%   file:set_cwd(?config(data_dir,Config)),
-%   {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P85-ibm85v01.xml"]),[]),
+%   file:set_cwd(datadir(Config)),
+%   {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P85-ibm85v01.xml"]),[]),
 %   xmerl:export([A],xmerl_test).
     {skip,["Fails to handle name containing characters > x#ff, since they are converted to atoms"]}.
 
 'ibm-valid-P82-ibm82v01'(suite) -> [];
 'ibm-valid-P82-ibm82v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P82-ibm82v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P82-ibm82v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P79-ibm79v01'(suite) -> [];
 'ibm-valid-P79-ibm79v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P79-ibm79v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P79-ibm79v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P78-ibm78v01'(suite) -> [];
 'ibm-valid-P78-ibm78v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P78-ibm78v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P78-ibm78v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P70-ibm70v01'(suite) -> [];
 'ibm-valid-P70-ibm70v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P70-ibm70v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P70-ibm70v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P69-ibm69v02'(suite) -> [];
 'ibm-valid-P69-ibm69v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P69-ibm69v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P69-ibm69v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P69-ibm69v01'(suite) -> [];
 'ibm-valid-P69-ibm69v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P69-ibm69v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P69-ibm69v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P68-ibm68v02'(suite) -> [];
 'ibm-valid-P68-ibm68v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P68-ibm68v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P68-ibm68v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P68-ibm68v01'(suite) -> [];
 'ibm-valid-P68-ibm68v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P68-ibm68v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P68-ibm68v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P67-ibm67v01'(suite) -> [];
 'ibm-valid-P67-ibm67v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P67-ibm67v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P67-ibm67v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P66-ibm66v01'(suite) -> [];
 'ibm-valid-P66-ibm66v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P66-ibm66v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P66-ibm66v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P65-ibm65v02'(suite) -> [];
 'ibm-valid-P65-ibm65v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P65-ibm65v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P65-ibm65v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P65-ibm65v01'(suite) -> [];
 'ibm-valid-P65-ibm65v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P65-ibm65v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P65-ibm65v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P64-ibm64v03'(suite) -> [];
 'ibm-valid-P64-ibm64v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P64-ibm64v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P64-ibm64v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P64-ibm64v02'(suite) -> [];
 'ibm-valid-P64-ibm64v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P64-ibm64v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P64-ibm64v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P64-ibm64v01'(suite) -> [];
 'ibm-valid-P64-ibm64v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P64-ibm64v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P64-ibm64v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P63-ibm63v05'(suite) -> [];
 'ibm-valid-P63-ibm63v05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P63-ibm63v05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P63-ibm63v05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P63-ibm63v04'(suite) -> [];
 'ibm-valid-P63-ibm63v04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P63-ibm63v04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P63-ibm63v04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P63-ibm63v03'(suite) -> [];
 'ibm-valid-P63-ibm63v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P63-ibm63v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P63-ibm63v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P63-ibm63v02'(suite) -> [];
 'ibm-valid-P63-ibm63v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P63-ibm63v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P63-ibm63v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P63-ibm63v01'(suite) -> [];
 'ibm-valid-P63-ibm63v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P63-ibm63v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P63-ibm63v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P62-ibm62v05'(suite) -> [];
 'ibm-valid-P62-ibm62v05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P62-ibm62v05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P62-ibm62v05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P62-ibm62v04'(suite) -> [];
 'ibm-valid-P62-ibm62v04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P62-ibm62v04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P62-ibm62v04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P62-ibm62v03'(suite) -> [];
 'ibm-valid-P62-ibm62v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P62-ibm62v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P62-ibm62v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P62-ibm62v02'(suite) -> [];
 'ibm-valid-P62-ibm62v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P62-ibm62v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P62-ibm62v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P62-ibm62v01'(suite) -> [];
 'ibm-valid-P62-ibm62v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P62-ibm62v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P62-ibm62v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P61-ibm61v02'(suite) -> [];
 'ibm-valid-P61-ibm61v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P61-ibm61v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P61-ibm61v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P61-ibm61v01'(suite) -> [];
 'ibm-valid-P61-ibm61v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P61-ibm61v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P61-ibm61v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P60-ibm60v04'(suite) -> [];
 'ibm-valid-P60-ibm60v04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P60-ibm60v04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P60-ibm60v04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P60-ibm60v03'(suite) -> [];
 'ibm-valid-P60-ibm60v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P60-ibm60v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P60-ibm60v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P60-ibm60v02'(suite) -> [];
 'ibm-valid-P60-ibm60v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P60-ibm60v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P60-ibm60v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P60-ibm60v01'(suite) -> [];
 'ibm-valid-P60-ibm60v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P60-ibm60v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P60-ibm60v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P59-ibm59v02'(suite) -> [];
 'ibm-valid-P59-ibm59v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P59-ibm59v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P59-ibm59v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P59-ibm59v01'(suite) -> [];
 'ibm-valid-P59-ibm59v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P59-ibm59v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P59-ibm59v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P58-ibm58v02'(suite) -> [];
 'ibm-valid-P58-ibm58v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P58-ibm58v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P58-ibm58v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P58-ibm58v01'(suite) -> [];
 'ibm-valid-P58-ibm58v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P58-ibm58v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P58-ibm58v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P57-ibm57v01'(suite) -> [];
 'ibm-valid-P57-ibm57v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P57-ibm57v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P57-ibm57v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P56-ibm56v10'(suite) -> [];
 'ibm-valid-P56-ibm56v10'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v10.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P56-ibm56v10.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P56-ibm56v09'(suite) -> [];
 'ibm-valid-P56-ibm56v09'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v09.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P56-ibm56v09.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P56-ibm56v08'(suite) -> [];
 'ibm-valid-P56-ibm56v08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P56-ibm56v08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P56-ibm56v07'(suite) -> [];
 'ibm-valid-P56-ibm56v07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P56-ibm56v07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P56-ibm56v06'(suite) -> [];
 'ibm-valid-P56-ibm56v06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P56-ibm56v06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P56-ibm56v05'(suite) -> [];
 'ibm-valid-P56-ibm56v05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P56-ibm56v05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P56-ibm56v04'(suite) -> [];
 'ibm-valid-P56-ibm56v04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P56-ibm56v04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P56-ibm56v03'(suite) -> [];
 'ibm-valid-P56-ibm56v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P56-ibm56v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P56-ibm56v02'(suite) -> [];
 'ibm-valid-P56-ibm56v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P56-ibm56v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P56-ibm56v01'(suite) -> [];
 'ibm-valid-P56-ibm56v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P56-ibm56v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P56-ibm56v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P55-ibm55v01'(suite) -> [];
 'ibm-valid-P55-ibm55v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P55-ibm55v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P55-ibm55v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P54-ibm54v03'(suite) -> [];
 'ibm-valid-P54-ibm54v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P54-ibm54v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P54-ibm54v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P54-ibm54v02'(suite) -> [];
 'ibm-valid-P54-ibm54v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P54-ibm54v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P54-ibm54v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P54-ibm54v01'(suite) -> [];
 'ibm-valid-P54-ibm54v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P54-ibm54v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P54-ibm54v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P52-ibm52v01'(suite) -> [];
 'ibm-valid-P52-ibm52v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P52-ibm52v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P52-ibm52v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P51-ibm51v02'(suite) -> [];
 'ibm-valid-P51-ibm51v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P51-ibm51v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P51-ibm51v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P51-ibm51v01'(suite) -> [];
 'ibm-valid-P51-ibm51v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P51-ibm51v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P51-ibm51v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P50-ibm50v01'(suite) -> [];
 'ibm-valid-P50-ibm50v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P50-ibm50v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P50-ibm50v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P49-ibm49v01'(suite) -> [];
 'ibm-valid-P49-ibm49v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P49-ibm49v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P49-ibm49v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P47-ibm47v01'(suite) -> [];
 'ibm-valid-P47-ibm47v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P47-ibm47v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P47-ibm47v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P45-ibm45v01'(suite) -> [];
 'ibm-valid-P45-ibm45v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P45-ibm45v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P45-ibm45v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P44-ibm44v01'(suite) -> [];
 'ibm-valid-P44-ibm44v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P44-ibm44v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P44-ibm44v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P43-ibm43v01'(suite) -> [];
 'ibm-valid-P43-ibm43v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P43-ibm43v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P43-ibm43v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P42-ibm42v01'(suite) -> [];
 'ibm-valid-P42-ibm42v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P42-ibm42v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P42-ibm42v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P41-ibm41v01'(suite) -> [];
 'ibm-valid-P41-ibm41v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P41-ibm41v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P41-ibm41v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P40-ibm40v01'(suite) -> [];
 'ibm-valid-P40-ibm40v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P40-ibm40v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P40-ibm40v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P39-ibm39v01'(suite) -> [];
 'ibm-valid-P39-ibm39v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P39-ibm39v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P39-ibm39v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P38-ibm38v01'(suite) -> [];
 'ibm-valid-P38-ibm38v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P38-ibm38v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P38-ibm38v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P37-ibm37v01'(suite) -> [];
 'ibm-valid-P37-ibm37v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P37-ibm37v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P37-ibm37v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P36-ibm36v01'(suite) -> [];
 'ibm-valid-P36-ibm36v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P36-ibm36v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P36-ibm36v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P35-ibm35v01'(suite) -> [];
 'ibm-valid-P35-ibm35v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P35-ibm35v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P35-ibm35v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P34-ibm34v01'(suite) -> [];
 'ibm-valid-P34-ibm34v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P34-ibm34v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P34-ibm34v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P33-ibm33v01'(suite) -> [];
 'ibm-valid-P33-ibm33v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P33-ibm33v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P33-ibm33v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P32-ibm32v04'(suite) -> [];
 'ibm-valid-P32-ibm32v04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P32-ibm32v04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P32-ibm32v04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P32-ibm32v03'(suite) -> [];
 'ibm-valid-P32-ibm32v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P32-ibm32v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P32-ibm32v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P32-ibm32v02'(suite) -> [];
 'ibm-valid-P32-ibm32v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P32-ibm32v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P32-ibm32v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P32-ibm32v01'(suite) -> [];
 'ibm-valid-P32-ibm32v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P32-ibm32v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P32-ibm32v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P31-ibm31v01'(suite) -> [];
 'ibm-valid-P31-ibm31v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P31-ibm31v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P31-ibm31v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P30-ibm30v02'(suite) -> [];
 'ibm-valid-P30-ibm30v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P30-ibm30v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P30-ibm30v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P30-ibm30v01'(suite) -> [];
 'ibm-valid-P30-ibm30v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P30-ibm30v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P30-ibm30v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P29-ibm29v02'(suite) -> [];
 'ibm-valid-P29-ibm29v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P29-ibm29v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P29-ibm29v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P29-ibm29v01'(suite) -> [];
 'ibm-valid-P29-ibm29v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P29-ibm29v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P29-ibm29v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P28-ibm28v02'(suite) -> [];
 'ibm-valid-P28-ibm28v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P28-ibm28v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P28-ibm28v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P28-ibm28v01'(suite) -> [];
 'ibm-valid-P28-ibm28v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P28-ibm28v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P28-ibm28v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P27-ibm27v03'(suite) -> [];
 'ibm-valid-P27-ibm27v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P27-ibm27v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P27-ibm27v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P27-ibm27v02'(suite) -> [];
 'ibm-valid-P27-ibm27v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P27-ibm27v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P27-ibm27v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P27-ibm27v01'(suite) -> [];
 'ibm-valid-P27-ibm27v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P27-ibm27v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P27-ibm27v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P26-ibm26v01'(suite) -> [];
 'ibm-valid-P26-ibm26v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P26-ibm26v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P26-ibm26v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P25-ibm25v04'(suite) -> [];
 'ibm-valid-P25-ibm25v04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P25-ibm25v04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P25-ibm25v04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P25-ibm25v03'(suite) -> [];
 'ibm-valid-P25-ibm25v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P25-ibm25v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P25-ibm25v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P25-ibm25v02'(suite) -> [];
 'ibm-valid-P25-ibm25v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P25-ibm25v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P25-ibm25v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P25-ibm25v01'(suite) -> [];
 'ibm-valid-P25-ibm25v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P25-ibm25v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P25-ibm25v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P24-ibm24v02'(suite) -> [];
 'ibm-valid-P24-ibm24v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P24-ibm24v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P24-ibm24v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P24-ibm24v01'(suite) -> [];
 'ibm-valid-P24-ibm24v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P24-ibm24v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P24-ibm24v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P23-ibm23v06'(suite) -> [];
 'ibm-valid-P23-ibm23v06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P23-ibm23v06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P23-ibm23v06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P23-ibm23v05'(suite) -> [];
 'ibm-valid-P23-ibm23v05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P23-ibm23v05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P23-ibm23v05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P23-ibm23v04'(suite) -> [];
 'ibm-valid-P23-ibm23v04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P23-ibm23v04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P23-ibm23v04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P23-ibm23v03'(suite) -> [];
 'ibm-valid-P23-ibm23v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P23-ibm23v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P23-ibm23v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P23-ibm23v02'(suite) -> [];
 'ibm-valid-P23-ibm23v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P23-ibm23v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P23-ibm23v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P23-ibm23v01'(suite) -> [];
 'ibm-valid-P23-ibm23v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P23-ibm23v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P23-ibm23v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P22-ibm22v07'(suite) -> [];
 'ibm-valid-P22-ibm22v07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P22-ibm22v07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P22-ibm22v07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P22-ibm22v06'(suite) -> [];
 'ibm-valid-P22-ibm22v06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P22-ibm22v06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P22-ibm22v06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P22-ibm22v05'(suite) -> [];
 'ibm-valid-P22-ibm22v05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P22-ibm22v05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P22-ibm22v05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P22-ibm22v04'(suite) -> [];
 'ibm-valid-P22-ibm22v04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P22-ibm22v04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P22-ibm22v04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P22-ibm22v03'(suite) -> [];
 'ibm-valid-P22-ibm22v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P22-ibm22v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P22-ibm22v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P22-ibm22v02'(suite) -> [];
 'ibm-valid-P22-ibm22v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P22-ibm22v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P22-ibm22v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P22-ibm22v01'(suite) -> [];
 'ibm-valid-P22-ibm22v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P22-ibm22v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P22-ibm22v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P21-ibm21v01'(suite) -> [];
 'ibm-valid-P21-ibm21v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P21-ibm21v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P21-ibm21v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P20-ibm20v02'(suite) -> [];
 'ibm-valid-P20-ibm20v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P20-ibm20v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P20-ibm20v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P20-ibm20v01'(suite) -> [];
 'ibm-valid-P20-ibm20v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P20-ibm20v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P20-ibm20v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P19-ibm19v01'(suite) -> [];
 'ibm-valid-P19-ibm19v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P19-ibm19v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P19-ibm19v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P18-ibm18v01'(suite) -> [];
 'ibm-valid-P18-ibm18v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P18-ibm18v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P18-ibm18v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P17-ibm17v01'(suite) -> [];
 'ibm-valid-P17-ibm17v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P17-ibm17v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P17-ibm17v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P16-ibm16v03'(suite) -> [];
 'ibm-valid-P16-ibm16v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P16-ibm16v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P16-ibm16v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P16-ibm16v02'(suite) -> [];
 'ibm-valid-P16-ibm16v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P16-ibm16v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P16-ibm16v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P16-ibm16v01'(suite) -> [];
 'ibm-valid-P16-ibm16v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P16-ibm16v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P16-ibm16v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P15-ibm15v04'(suite) -> [];
 'ibm-valid-P15-ibm15v04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P15-ibm15v04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P15-ibm15v04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P15-ibm15v03'(suite) -> [];
 'ibm-valid-P15-ibm15v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P15-ibm15v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P15-ibm15v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P15-ibm15v02'(suite) -> [];
 'ibm-valid-P15-ibm15v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P15-ibm15v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P15-ibm15v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P15-ibm15v01'(suite) -> [];
 'ibm-valid-P15-ibm15v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P15-ibm15v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P15-ibm15v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P14-ibm14v03'(suite) -> [];
 'ibm-valid-P14-ibm14v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P14-ibm14v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P14-ibm14v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P14-ibm14v02'(suite) -> [];
 'ibm-valid-P14-ibm14v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P14-ibm14v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P14-ibm14v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P14-ibm14v01'(suite) -> [];
 'ibm-valid-P14-ibm14v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P14-ibm14v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P14-ibm14v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P13-ibm13v01'(suite) -> [];
 'ibm-valid-P13-ibm13v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P13-ibm13v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P13-ibm13v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P12-ibm12v04'(suite) -> [];
 'ibm-valid-P12-ibm12v04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P12-ibm12v04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P12-ibm12v04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P12-ibm12v03'(suite) -> [];
 'ibm-valid-P12-ibm12v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P12-ibm12v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P12-ibm12v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P12-ibm12v02'(suite) -> [];
 'ibm-valid-P12-ibm12v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P12-ibm12v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P12-ibm12v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P12-ibm12v01'(suite) -> [];
 'ibm-valid-P12-ibm12v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P12-ibm12v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P12-ibm12v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P11-ibm11v04'(suite) -> [];
 'ibm-valid-P11-ibm11v04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P11-ibm11v04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P11-ibm11v04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P11-ibm11v03'(suite) -> [];
 'ibm-valid-P11-ibm11v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P11-ibm11v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P11-ibm11v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P11-ibm11v02'(suite) -> [];
 'ibm-valid-P11-ibm11v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P11-ibm11v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P11-ibm11v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P11-ibm11v01'(suite) -> [];
 'ibm-valid-P11-ibm11v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P11-ibm11v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P11-ibm11v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P10-ibm10v08'(suite) -> [];
 'ibm-valid-P10-ibm10v08'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v08.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P10-ibm10v08.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P10-ibm10v07'(suite) -> [];
 'ibm-valid-P10-ibm10v07'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v07.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P10-ibm10v07.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P10-ibm10v06'(suite) -> [];
 'ibm-valid-P10-ibm10v06'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v06.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P10-ibm10v06.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P10-ibm10v05'(suite) -> [];
 'ibm-valid-P10-ibm10v05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P10-ibm10v05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P10-ibm10v04'(suite) -> [];
 'ibm-valid-P10-ibm10v04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P10-ibm10v04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P10-ibm10v03'(suite) -> [];
 'ibm-valid-P10-ibm10v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P10-ibm10v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P10-ibm10v02'(suite) -> [];
 'ibm-valid-P10-ibm10v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P10-ibm10v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P10-ibm10v01'(suite) -> [];
 'ibm-valid-P10-ibm10v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P10-ibm10v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P10-ibm10v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P09-ibm09v05'(suite) -> [];
 'ibm-valid-P09-ibm09v05'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P09-ibm09v05.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P09-ibm09v05.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P09-ibm09v04'(suite) -> [];
 'ibm-valid-P09-ibm09v04'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P09-ibm09v04.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P09-ibm09v04.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P09-ibm09v03'(suite) -> [];
 'ibm-valid-P09-ibm09v03'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P09-ibm09v03.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P09-ibm09v03.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P09-ibm09v02'(suite) -> [];
 'ibm-valid-P09-ibm09v02'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P09-ibm09v02.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P09-ibm09v02.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P09-ibm09v01'(suite) -> [];
 'ibm-valid-P09-ibm09v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P09-ibm09v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P09-ibm09v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P03-ibm03v01'(suite) -> [];
 'ibm-valid-P03-ibm03v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P03-ibm03v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P03-ibm03v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P02-ibm02v01'(suite) -> [];
 'ibm-valid-P02-ibm02v01'(Config) ->
-  file:set_cwd(?config(data_dir,Config)),
-  {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P02-ibm02v01.xml"]),[]),
+  file:set_cwd(datadir(Config)),
+  {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P02-ibm02v01.xml"]),[]),
   xmerl:export([A],xmerl_test).
 
 'ibm-valid-P01-ibm01v01'(suite) -> [];
 'ibm-valid-P01-ibm01v01'(Config) ->
-    file:set_cwd(?config(data_dir,Config)),
-    {A,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),ibm,"ibm-valid-P01-ibm01v01.xml"]),[]),
+    file:set_cwd(datadir(Config)),
+    {A,_} = xmerl_scan:file(datadir_join(Config,[ibm,"ibm-valid-P01-ibm01v01.xml"]),[]),
     xmerl:export([A],xmerl_test).
 
 
@@ -11765,7 +11765,13 @@ chmod(F) ->
 	    ok
     end.
     
+privdir(Config) ->
+    proplists:get_value(priv_dir, Config).
+datadir(Config) ->
+    proplists:get_value(data_dir, Config).
 
+datadir_join(Config,Files) ->
+    filename:join([datadir(Config)|Files]).
 
 
 
diff --git a/lib/xmerl/test/xmerl_test_lib.erl b/lib/xmerl/test/xmerl_test_lib.erl
index e3246d19a4..58a6341587 100644
--- a/lib/xmerl/test/xmerl_test_lib.erl
+++ b/lib/xmerl/test/xmerl_test_lib.erl
@@ -88,6 +88,6 @@ keysearch_delete(Key,N,List) ->
 %% the original data directory.
 
 get_data_dir(Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     Opts = [{return,list}],
     re:replace(Data, "xmerl_sax_std_SUITE", "xmerl_std_SUITE", Opts).
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE.erl b/lib/xmerl/test/xmerl_xsd_SUITE.erl
index cd3ecaa3bd..638bf89fd2 100644
--- a/lib/xmerl/test/xmerl_xsd_SUITE.erl
+++ b/lib/xmerl/test/xmerl_xsd_SUITE.erl
@@ -78,8 +78,8 @@ suite() ->
     [{timetrap,{minutes,10}}].
 
 init_per_testcase(_TestCase,Config) ->
-    {ok,_} = file:read_file_info(filename:join([?config(priv_dir,Config)])),
-    code:add_patha(?config(priv_dir,Config)),
+    {ok,_} = file:read_file_info(filename:join([privdir(Config)])),
+    code:add_patha(privdir(Config)),
     Config.
 
 end_per_testcase(_Func,_Config) ->
@@ -702,9 +702,9 @@ minExclusive(_Config) ->
     {ok,"126743.233E11"} = (xmerl_xsd_type:facet_fun(float,{minExclusive,"1267.43233E12"}))("126743.233E11"),
     {ok,"34E-26"} = (xmerl_xsd_type:facet_fun(float,{minExclusive,"33E-27"}))("34E-26"),
 
-    {ok,"P1Y2M3DT10H30M"}  = (xmerl_xsd_type:facet_fun(duration,{minExclusive,"P1Y2M3D"}))("P1Y2M3DT10H30M"),
+    {ok,"P1Y2M3DT10H30M"} = (xmerl_xsd_type:facet_fun(duration,{minExclusive,"P1Y2M3D"}))("P1Y2M3DT10H30M"),
 
-    {ok,"2006-09-06T19:17:45Z"}  = (xmerl_xsd_type:facet_fun(dateTime,{minExclusive,"2006-09-06T19:17:44Z"}))("2006-09-06T19:17:45Z"),
+    {ok,"2006-09-06T19:17:45Z"} = (xmerl_xsd_type:facet_fun(dateTime,{minExclusive,"2006-09-06T19:17:44Z"}))("2006-09-06T19:17:45Z"),
     ok.
 
 minInclusive(suite) -> [];
@@ -738,18 +738,14 @@ minInclusive(_Config) ->
 
     {ok,"4"} = (xmerl_xsd_type:facet_fun(integer,{minInclusive,"-3"}))("4"),
 
-    {ok,"+1000000.00"} =
-	(xmerl_xsd_type:facet_fun(decimal,{minInclusive,"1E6"}))("+1000000.00"),
+    {ok,"+1000000.00"} = (xmerl_xsd_type:facet_fun(decimal,{minInclusive,"1E6"}))("+1000000.00"),
     %% must support 18 digits
     {ok,"12678967.5432323456"} =
 	(xmerl_xsd_type:facet_fun(decimal,{minInclusive,"12678967.54323234555"}))("12678967.5432323456"),
 
-    {ok,"3.2E-11"} =
-	(xmerl_xsd_type:facet_fun(double,{minInclusive,"2E-12"}))("3.2E-11"),
-    {ok,"10E20"} =
-	(xmerl_xsd_type:facet_fun(double,{minInclusive,"-INF"}))("10E20"),
-    {ok,"0.1279"} =
-	(xmerl_xsd_type:facet_fun(double,{minInclusive,"12.78e-2"}))("0.1279"),
+    {ok,"3.2E-11"} = (xmerl_xsd_type:facet_fun(double,{minInclusive,"2E-12"}))("3.2E-11"),
+    {ok,"10E20"} = (xmerl_xsd_type:facet_fun(double,{minInclusive,"-INF"}))("10E20"),
+    {ok,"0.1279"} = (xmerl_xsd_type:facet_fun(double,{minInclusive,"12.78e-2"}))("0.1279"),
 
     {ok,"126743.233E11"} = (xmerl_xsd_type:facet_fun(float,{minInclusive,"1267.43233E12"}))("126743.233E11"),
     {ok,"34E-26"} = (xmerl_xsd_type:facet_fun(float,{minInclusive,"33E-27"}))("34E-26"),
@@ -851,201 +847,192 @@ compare_duration(_Config) ->
 
 xml_xsd(suite) -> [];
 xml_xsd(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = datadir( Config),
     Options = [{fetch_path, [DataDir]}],
     {ok, _} = xmerl_xsd:process_schema("xml.xsd", Options).
 
 xml_lang_attr(suite) -> [];
 xml_lang_attr(Config) ->
-    DataDir = ?config(data_dir, Config),
-    {Element, _} = xmerl_scan:file(filename:join([DataDir, "book.xml"])),
+    DataDir = datadir( Config),
+    {Element, _} = xmerl_scan:file(filename:join([DataDir,"book.xml"])),
     Options = [{fetch_path, [DataDir]}],
     {ok, Schema} = xmerl_xsd:process_schema("book.xsd", Options),
     {Element, _} = xmerl_xsd:validate(Element, Schema).
 
 po(suite) -> [];
 po(Config) ->
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "po.xml"]),[]),
-    {E,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "po.xsd"]),E,[]).
+    {E,_} = xmerl_scan:file(datadir_join(Config,["po.xml"]),[]),
+    {E,_} = xmerl_xsd:process_validate(datadir_join(Config,["po.xsd"]),E,[]).
 
 po1(suite) -> [];
 po1(Config) ->
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "po1.xml"]),[]),
-    {E2,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "po1.xsd"]),E,[]),
+    {E,_} = xmerl_scan:file(datadir_join(Config,["po1.xml"]),[]),
+    {E2,_} = xmerl_xsd:process_validate(datadir_join(Config,["po1.xsd"]),E,[]),
     ok = xmerl_test_lib:cmp_element(E,E2).
 
 po2(suite) -> [];
 po2(Config) ->
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "po2.xml"]),[]),
-    {E2,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "po1.xsd"]),E,[]),
+    {E,_} = xmerl_scan:file(datadir_join(Config,["po2.xml"]),[]),
+    {E2,_} = xmerl_xsd:process_validate(datadir_join(Config,["po1.xsd"]),E,[]),
     ok = xmerl_test_lib:cmp_element(E,E2).
 
 ipo(suite) -> [];
 ipo(Config) ->
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "ipo.xml"]),[]),
-    {VE,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "ipo.xsd"]),E,[]),
+    {E,_} = xmerl_scan:file(datadir_join(Config,["ipo.xml"]),[]),
+    {VE,_} = xmerl_xsd:process_validate(datadir_join(Config,["ipo.xsd"]),E,[]),
     ok = xmerl_test_lib:cmp_element(E,VE).
 
 ipo_redefine(suite) -> [];
 ipo_redefine(Config) ->
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
-                                           "ipo_redefine.xml"]),[]),
-    {VE,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
-                                                       "ipo_redefine.xsd"]),E,[]),
+    {E,_} = xmerl_scan:file(datadir_join(Config,["ipo_redefine.xml"]),[]),
+    {VE,_} = xmerl_xsd:process_validate(datadir_join(Config,["ipo_redefine.xsd"]),E,[]),
     ok = xmerl_test_lib:cmp_element(E,VE).
 
 '4Q99'(suite) -> [];
 '4Q99'(Config) ->
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "4Q99.xml"]),[]),
+    {E,_} = xmerl_scan:file(datadir_join(Config,["4Q99.xml"]),[]),
     %% the import in report.xsd lacks schemaLocation, so the imported
     %% namespace definitions have to be loaded separately.
-    {ok,S} = xmerl_xsd:process_schema(filename:join([?config(data_dir,Config), "ipo.xsd"])),
-    {VE,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "report.xsd"]),E,[{state,S}]),
+    {ok,S} = xmerl_xsd:process_schema(datadir_join(Config,["ipo.xsd"])),
+    {VE,_} = xmerl_xsd:process_validate(datadir_join(Config,["report.xsd"]),E,[{state,S}]),
     ok = xmerl_test_lib:cmp_element(E,VE),
     
     %% report2.xsd has an import element with a schemaLocation attribute
-    {VE,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "report2.xsd"]),E,[]).
+    {VE,_} = xmerl_xsd:process_validate(datadir_join(Config,["report2.xsd"]),E,[]).
     
 small(suite) -> [];
 small(Config) ->
-    {E=#xmlElement{},_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "small.xml"]),[]),
-    {VE=#xmlElement{},_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "small.xsd"]),E,[]),
+    {E=#xmlElement{},_} = xmerl_scan:file(datadir_join(Config,["small.xml"]),[]),
+    {VE=#xmlElement{},_} = xmerl_xsd:process_validate(datadir_join(Config,["small.xsd"]),E,[]),
     #xmlElement{attributes=Atts,content=C} = VE,
     C = E#xmlElement.content,
     %% The attribute orderStatus with default value was absent in small.xml
 
     %% Test of validation "on the fly" when parsing XML.
-    {VE,_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "small.xml"]),
+    {VE,_} = xmerl_scan:file(datadir_join(Config,["small.xml"]),
                              [{validation,schema},
-                              {schemaLocation,[{"small",filename:join(?config(data_dir,Config),"small.xsd")}]}]),
-    {VE,_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "small.xml"]),
+                              {schemaLocation,[{"small",filename:join(datadir(Config),"small.xsd")}]}]),
+    {VE,_} = xmerl_scan:file(datadir_join(Config,["small.xml"]),
                              [{validation,schema}]),
     true = lists:keymember(orderStatus,#xmlAttribute.name,Atts).
 
 complexType1(suite) -> [];
 complexType1(Config) ->
-    {E1=#xmlElement{},_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "complexTypes1.xml"]),[]),
-    {VE1=#xmlElement{},_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "complexTypes.xsd"]),E1,[]),
+    {E1=#xmlElement{},_} = xmerl_scan:file(datadir_join(Config,["complexTypes1.xml"]),[]),
+    {VE1=#xmlElement{},_} = xmerl_xsd:process_validate(datadir_join(Config,[ "complexTypes.xsd"]),E1,[]),
     ok = xmerl_test_lib:cmp_element(E1,VE1),
 
-    {E2=#xmlElement{},_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "complexTypes2.xml"]),[]),
-    {VE2=#xmlElement{},_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "complexTypes.xsd"]),E2,[]),
+    {E2=#xmlElement{},_} = xmerl_scan:file(datadir_join(Config,["complexTypes2.xml"]),[]),
+    {VE2=#xmlElement{},_} = xmerl_xsd:process_validate(datadir_join(Config,["complexTypes.xsd"]),E2,[]),
     ok = xmerl_test_lib:cmp_element(E2,VE2).
 
 model_group_all(suite) -> [];
 model_group_all(Config) ->
-    {E=#xmlElement{},_} = xmerl_scan:file(filename:join([?config(data_dir,Config),"po1.xml"]),[]),
-    {E,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),"po1_all.xsd"]),E,[]),
+    {E=#xmlElement{},_} = xmerl_scan:file(datadir_join(Config,["po1.xml"]),[]),
+    {E,_} = xmerl_xsd:process_validate(datadir_join(Config,["po1_all.xsd"]),E,[]),
 
-    {E1=#xmlElement{},_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "po1_all1.xml"]),[]),
-    {E1,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "po1_all.xsd"]),E1,[]),
+    {E1=#xmlElement{},_} = xmerl_scan:file(datadir_join(Config,["po1_all1.xml"]),[]),
+    {E1,_} = xmerl_xsd:process_validate(datadir_join(Config,["po1_all.xsd"]),E1,[]),
 
-    {E2=#xmlElement{},_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "po1_all2.xml"]),[]),
-    {E2,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "po1_all.xsd"]),E2,[]),
+    {E2=#xmlElement{},_} = xmerl_scan:file(datadir_join(Config,["po1_all2.xml"]),[]),
+    {E2,_} = xmerl_xsd:process_validate(datadir_join(Config,["po1_all.xsd"]),E2,[]),
 
-    {E3=#xmlElement{},_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "po1_all_err1.xml"]),[]),
-    {error,_Reason1} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "po1_all.xsd"]),E3,[]),
+    {E3=#xmlElement{},_} = xmerl_scan:file(datadir_join(Config,["po1_all_err1.xml"]),[]),
+    {error,_Reason1} = xmerl_xsd:process_validate(datadir_join(Config,["po1_all.xsd"]),E3,[]),
 
     
-    {E4=#xmlElement{},_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "po1_all_err2.xml"]),[]),
-    {error,_Reason2} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "po1_all.xsd"]),E4,[]).
+    {E4=#xmlElement{},_} = xmerl_scan:file(datadir_join(Config,["po1_all_err2.xml"]),[]),
+    {error,_Reason2} = xmerl_xsd:process_validate(datadir_join(Config,["po1_all.xsd"]),E4,[]).
 
 substitutionGroup(suite) -> [];
 substitutionGroup(Config) ->
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "ipo_substGroup.xml"]),[]),
-    {E,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "ipo_substGroup.xsd"]),E,[]).
+    {E,_} = xmerl_scan:file(datadir_join(Config,["ipo_substGroup.xml"]),[]),
+    {E,_} = xmerl_xsd:process_validate(datadir_join(Config,["ipo_substGroup.xsd"]),E,[]).
 
 attributeGroup(suite) -> [];
 attributeGroup(Config) ->
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "po_attrGroup.xml"]),[]),
-    {E,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "po_attrGroup.xsd"]),E,[]).
+    {E,_} = xmerl_scan:file(datadir_join(Config,["po_attrGroup.xml"]),[]),
+    {E,_} = xmerl_xsd:process_validate(datadir_join(Config,["po_attrGroup.xsd"]),E,[]).
 
 test_key1(suite) -> [];
 test_key1(Config) ->
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "vehicle2.xml"]),[]),
-    {E,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "vehicle.xsd"]),E,[]),
+    {E,_} = xmerl_scan:file(datadir_join(Config,["vehicle2.xml"]),[]),
+    {E,_} = xmerl_xsd:process_validate(datadir_join(Config,["vehicle.xsd"]),E,[]),
 
-    {E2,_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "vehicle.xml"]),[]),
-    {error,L2} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "vehicle.xsd"]),E2,[]),
+    {E2,_} = xmerl_scan:file(datadir_join(Config,["vehicle.xml"]),[]),
+    {error,L2} = xmerl_xsd:process_validate(datadir_join(Config,["vehicle.xsd"]),E2,[]),
     10 = erlang:length(L2),
 
-    {E3 = #xmlElement{},_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "vehicle3.xml"]),[]),
-    {E3 = #xmlElement{},_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), "vehicle.xsd"]),E3,[]).
+    {E3 = #xmlElement{},_} = xmerl_scan:file(datadir_join(Config,["vehicle3.xml"]),[]),
+    {E3 = #xmlElement{},_} = xmerl_xsd:process_validate(datadir_join(Config,["vehicle.xsd"]),E3,[]).
 
 sis1(suite) -> []; 
 sis1(Config) ->
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sis,"instance.xml"]),[]),
-    {#xmlElement{},_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),sis,"IntegratedSite.xsd"]),E,[]).
+    {E,_} = xmerl_scan:file(datadir_join(Config,[sis,"instance.xml"]),[]),
+    {#xmlElement{},_} = xmerl_xsd:process_validate(datadir_join(Config,[sis,"IntegratedSite.xsd"]),E,[]).
+
 sis2(suite) -> [];
 sis2(Config) ->
-    {BS_E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sis,"bs_mim.xml"]),[]),
-    {SW_E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sis,"swm_mim.xml"]),[]),
-    {HW_E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),sis,"hwm_mim.xml"]),[]),
+    {BS_E,_} = xmerl_scan:file(datadir_join(Config,[sis,"bs_mim.xml"]),[]),
+    {SW_E,_} = xmerl_scan:file(datadir_join(Config,[sis,"swm_mim.xml"]),[]),
+    {HW_E,_} = xmerl_scan:file(datadir_join(Config,[sis,"hwm_mim.xml"]),[]),
 
-    {#xmlElement{},_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),sis,"mim.xsd"]),BS_E,[]),
-    {#xmlElement{},_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),sis,"mim.xsd"]),SW_E,[]),
-    {#xmlElement{},_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),sis,"mim.xsd"]),HW_E,[]).
+    {#xmlElement{},_} = xmerl_xsd:process_validate(datadir_join(Config,[sis,"mim.xsd"]),BS_E,[]),
+    {#xmlElement{},_} = xmerl_xsd:process_validate(datadir_join(Config,[sis,"mim.xsd"]),SW_E,[]),
+    {#xmlElement{},_} = xmerl_xsd:process_validate(datadir_join(Config,[sis,"mim.xsd"]),HW_E,[]).
 
 state2file_file2state(suite) -> [];
 state2file_file2state(Config) ->
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "po.xml"]),[]),
-    {ok,S} = xmerl_xsd:process_schema(filename:join([?config(data_dir,Config),"po.xsd"])),
+    {E,_} = xmerl_scan:file(datadir_join(Config,[ "po.xml"]),[]),
+    {ok,S} = xmerl_xsd:process_schema(datadir_join(Config,["po.xsd"])),
     {E,_} = xmerl_xsd:validate(E,S),
     ok = xmerl_xsd:state2file(S),
-    {ok,S} = xmerl_xsd:file2state(filename:join([?config(data_dir,Config),"po.xss"])),
+    {ok,S} = xmerl_xsd:file2state(datadir_join(Config,["po.xss"])),
     {E,_} = xmerl_xsd:validate(E,S),
     
-    ok = xmerl_xsd:state2file(S,filename:join([?config(data_dir,Config),"po_state"])),
-    {ok,S} = xmerl_xsd:file2state(filename:join([?config(data_dir,Config),"po_state.xss"])),
+    ok = xmerl_xsd:state2file(S,datadir_join(Config,["po_state"])),
+    {ok,S} = xmerl_xsd:file2state(datadir_join(Config,["po_state.xss"])),
 
     {E,_} = xmerl_xsd:validate(E,S).
 
 
 union(suite) -> [];
 union(Config) ->
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config), "instance.xml"])),
-    {_E2 = #xmlElement{},_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),"measCollec.xsd"]),E).
+    {E,_} = xmerl_scan:file(datadir_join(Config,["instance.xml"])),
+    {_E2 = #xmlElement{},_} = xmerl_xsd:process_validate(datadir_join(Config,["measCollec.xsd"]),E).
     
-
 ticket_6910(suite) -> [];
 ticket_6910(Config) ->
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
-						 sis,"dummy_action_mim.xml"])),
+    {E,_} = xmerl_scan:file(datadir_join(Config,[sis,"dummy_action_mim.xml"])),
     {_E2 = #xmlElement{},_} =
-	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
-						  sis,"mim2.xsd"]),E).
+	xmerl_xsd:process_validate(datadir_join(Config,[sis,"mim2.xsd"]),E).
+
 ticket_7165(suite) -> [];
 ticket_7165(Config) ->
     %% The validation option seems not to work
-    {_E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
-                                            "ticket_7288.xml"]), 
+    {_E,_} = xmerl_scan:file(datadir_join(Config,["ticket_7288.xml"]),
                              [{validation, schema}]),
     %% The option xsdbase gave {error, enoent}.
-    {ok,_} = xmerl_xsd:process_schema("CxDataType_Rel5.xsd", [{xsdbase, ?config(data_dir,Config)}]).
+    {ok,_} = xmerl_xsd:process_schema("CxDataType_Rel5.xsd", [{xsdbase, datadir(Config)}]).
 
 
 
 ticket_7190(suite) -> [];
 ticket_7190(Config) ->
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),
-						 "int.xml"])),
-    {_E2 = #xmlElement{},_} =
-	xmerl_xsd:process_validate(filename:join([?config(data_dir,Config),
-						  "simple_int.xsd"]),E).
+    {E,_} = xmerl_scan:file(datadir_join(Config,["int.xml"])),
+    {_E2 = #xmlElement{},_} = xmerl_xsd:process_validate(datadir_join(Config,["simple_int.xsd"]),E).
+
 ticket_7288(suite) -> [];
 ticket_7288(Config) ->
     %% The schema table in the state where deleted by xmerl_xsd:validate if there was an error.
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),"ticket_7288.xml"])),
-    
-    {ok,S} = xmerl_xsd:process_schema(filename:join([?config(data_dir,Config),"CxDataType_Rel5.xsd"])),
-    
+    {E,_} = xmerl_scan:file(datadir_join(Config,["ticket_7288.xml"])),
+    {ok,S} = xmerl_xsd:process_schema(datadir_join(Config,["CxDataType_Rel5.xsd"])),
     {error, EL} = xmerl_xsd:validate(E, S),
-    
     {error, EL} = xmerl_xsd:validate(E, S).
  
 ticket_7736(suite) -> [];
 ticket_7736(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = datadir(Config),
     {ok, State } = xmerl_xsd:process_schema(filename:join([DataDir,"enum_bug.xsd"])),
     
     {Entity ,_} = xmerl_scan:file(filename:join([DataDir,"enum_bug.xml"])),
@@ -1054,14 +1041,26 @@ ticket_7736(Config) ->
 
 ticket_8599(suite) -> [];
 ticket_8599(Config) ->
-    {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),"ticket_8599.xml"])),
+    {E,_} = xmerl_scan:file(datadir_join(Config,["ticket_8599.xml"])),
     
-    {ok, S} = xmerl_xsd:process_schema(filename:join([?config(data_dir,Config),"ticket_8599.xsd"])),
+    {ok, S} = xmerl_xsd:process_schema(datadir_join(Config,["ticket_8599.xsd"])),
     
     {{xmlElement,persons,persons,_,_,_,_,_,_,_,_,_},_GlobalState} = xmerl_xsd:validate(E, S).
 
 
 ticket_9410(suite) -> [];
 ticket_9410(Config) ->
-    file:set_cwd(filename:join([?config(data_dir,Config),".."])),
+    file:set_cwd(datadir_join(Config,[".."])),
     {ok, _S} = xmerl_xsd:process_schema("xmerl_xsd_SUITE_data/small.xsd").
+
+%%======================================================================
+%% Support Functions
+%%======================================================================
+
+privdir(Config) ->
+    proplists:get_value(priv_dir, Config).
+datadir(Config) ->
+    proplists:get_value(data_dir, Config).
+
+datadir_join(Config,Files) ->
+    filename:join([datadir(Config)|Files]).
diff --git a/lib/xmerl/test/xmerl_xsd_lib.erl b/lib/xmerl/test/xmerl_xsd_lib.erl
index 46134288f1..6006cf500f 100644
--- a/lib/xmerl/test/xmerl_xsd_lib.erl
+++ b/lib/xmerl/test/xmerl_xsd_lib.erl
@@ -104,7 +104,7 @@ return_results2({NewFail, NewSuccess, NewMal, NewNotMal}, NumSucc, SkippedN, Tot
 
 process_reference_results(Config, {ErrsST, MalST}, {ErrsIT, MalIT}) ->
     {RefFailed, RefMalicious} = xsd_reference_log(Config),
-io:format("A: ~p : ~p\n\n",[RefFailed, RefMalicious]),
+    io:format("A: ~p : ~p\n\n",[RefFailed, RefMalicious]),
     AllErrs = ErrsST ++ ErrsIT,
     AllMals = MalST ++ MalIT,
     %% test cases failed now but succeeded in reference results.
@@ -116,44 +116,45 @@ io:format("A: ~p : ~p\n\n",[RefFailed, RefMalicious]),
     %% test cases succeeded now but malicious in reference results.
     NewNotMal = [X||X<-RefMalicious, lists:member(X, AllMals) == false],
     write_in_log(Config, AllErrs, AllMals),
-%    io:format("process_reference_results:~n  AllErrs = ~p~n  NewFailures = ~p~n",[AllErrs,NewFailures]),
+    % io:format("process_reference_results:~n  AllErrs = ~p~n  NewFailures = ~p~n",[AllErrs,NewFailures]),
     {length(RefFailed) + length(RefMalicious), {NewFailures, NewSucceeds, NewMalicious, NewNotMal}}.
 
 xsd_reference_log(Config) ->
-    DataDir = ?config(data_dir, Config),
-    Suite = ?config(suite, Config),
+    DataDir = datadir(Config),
+    Suite = proplists:get_value(suite, Config),
     SuiteReferenceLog = 
-	filename:join([DataDir, lists:concat([Suite, "_failed_cases.log"])]),
-io:format("B: ~p\n\n",[SuiteReferenceLog]),
+    filename:join([DataDir,lists:concat([Suite,"_failed_cases.log"])]),
+    io:format("B: ~p\n\n",[SuiteReferenceLog]),
     case file:consult(SuiteReferenceLog) of
-	{ok,List} when is_list(List) ->
-io:format("C: ~p\n\n",[List]),
-	    case lists:keysearch(?config(testcase, Config), 1, List) of
-		{value,{_, TCRefFails}} ->
-io:format("D: ~p\n\n",[TCRefFails]),
-		    TCRefFails;
-		_ ->
-io:format("D: ~no result\n\n",[]),
-		    {[], []}
-	    end;
-	_ -> 
-	    {[], []}
+        {ok,List} when is_list(List) ->
+            io:format("C: ~p\n\n",[List]),
+            case lists:keysearch(proplists:get_value(testcase, Config), 1, List) of
+                {value,{_, TCRefFails}} ->
+                    io:format("D: ~p\n\n",[TCRefFails]),
+                    TCRefFails;
+                _ ->
+                    io:format("D: ~no result\n\n",[]),
+                    {[], []}
+            end;
+        _ ->
+            {[], []}
     end.
 
 write_in_log(_Config, [], []) ->
     ok;
 write_in_log(Config, AllErrs, AllMals) ->
-    LogFileName = ?config(xmerl_error_log, Config),
+    LogFileName = proplists:get_value(xmerl_error_log, Config),
     {ok,IO}=file:open(LogFileName, [append]),
-    TestCase = ?config(testcase, Config),
+    TestCase = proplists:get_value(testcase, Config),
     io:format(IO,"{~p,{~p,~p}}.~n", [TestCase, AllErrs, AllMals]),
     file:close(IO),
     ok.
 
 schema_test(Config,FileName,XsdBase,Validity) ->
     ModuleName = filename:basename(FileName),
-    DataDir = ?config(data_dir, Config),
-    case xmerl_xsd:process_schema(filename:join([DataDir, FileName]), [{xsdbase,filename:join([DataDir, XsdBase])}]) of
+    DataDir = datadir(Config),
+    case xmerl_xsd:process_schema(filename:join([DataDir, FileName]),
+                                  [{xsdbase,filename:join([DataDir, XsdBase])}]) of
 	{error, enoent} ->
 	    {{ModuleName, enoent},#xsd_state{}};
 	{Ok, S} ->
@@ -176,9 +177,9 @@ schema_test(Config,FileName,XsdBase,Validity) ->
     end.
 schema_test(Config, FileName, XsdBase, Validity, AccState) ->
     ModuleName = filename:basename(FileName),
-    DataDir = ?config(data_dir, Config),
+    DataDir = datadir(Config),
     case xmerl_xsd:process_schema(filename:join([DataDir, FileName]),
-                                  [{xsdbase, filename:join([DataDir, XsdBase])}, AccState]) of
+                                  [{xsdbase,filename:join([DataDir, XsdBase])}, AccState]) of
         {error, enoent} ->
             {{ModuleName, enoent}, AccState};
         {Ok, S} ->
@@ -197,9 +198,9 @@ schema_test(Config, FileName, XsdBase, Validity, AccState) ->
     end.
 instance_test(Config, FileName, XMLBase, Validity, State) ->
     ModuleName = filename:basename(FileName),
-    DataDir = ?config(data_dir, Config),
+    DataDir = datadir(Config),
     case xmerl_scan:file(filename:join([DataDir, FileName]),
-                         [{xmlbase, filename:join([DataDir, XMLBase])}]) of
+                         [{xmlbase,filename:join([DataDir, XMLBase])}]) of
         {error, enoent} ->
             {ModuleName, enoent};
         {E, _} ->
@@ -231,7 +232,7 @@ no_internal_error(R) ->
 
 unpack(Config, Suite) ->
     TarFile = suite_tar(Suite),
-    file:set_cwd(?config(data_dir, Config)),
+    file:set_cwd(datadir(Config)),
     ok=erl_tar:extract(TarFile, [compressed]),
     change_mode(filename:rootname(TarFile, ".tar.gz")).
     
@@ -272,7 +273,7 @@ chmod(F) ->
     end.
 
 rmdir(Config, Suite) ->
-    file:set_cwd(?config(data_dir, Config)),
+    file:set_cwd(datadir(Config)),
     SuiteDir = filename:rootname(suite_tar(Suite), ".tar.gz"),
     ok=rm_f_(SuiteDir).
 
@@ -301,12 +302,12 @@ create_error_log_file(Config, Suite) ->
     {{Y, M, D}, {H, Min, S}} = calendar:local_time(),
     DTString=lists:concat([Y, "-", M,"-", D, "_", H, ".", Min, ".", S]),
     FileName = lists:concat([Suite, "_", DTString, ".errorlog"]),
-%%    {ok,_IO} = file:open(filename:join([?config(priv_dir,Config),
+%%    {ok,_IO} = file:open(filename:join([privdir(Config),
 %% 					      FileName]),[append]).
 
 %%    {ok,_IO} = file:open(FileName,[append]).
-    io:format("error log file: ~p~n", [filename:join([?config(priv_dir,Config), FileName])]),
-    {ok, filename:join([?config(priv_dir,Config), FileName])}.
+    io:format("error log file: ~p~n", [filename:join([privdir(Config), FileName])]),
+    {ok, filename:join([privdir(Config), FileName])}.
 
 close_error_log_file(Config) ->
     case lists:keysearch(xmerl_error_log, 1, Config) of
@@ -315,3 +316,8 @@ close_error_log_file(Config) ->
         _ ->
             ok
     end.
+
+privdir(Config) ->
+    proplists:get_value(priv_dir, Config).
+datadir(Config) ->
+    proplists:get_value(data_dir, Config).