Merge branch 'ingela/odbc/ctify' into maint

* ingela/odbc/ctify:
  odbc: Convert doc clauses form test_server to ct
  odbc: Replace test_server with ct eqvivalents
  odbc: Remove legacy config macros
  odbc: Remove legacy suite clauses from test suites

5 files changed, 464 insertions, 652 deletions

diff --git a/lib/odbc/test/odbc_connect_SUITE.erl b/lib/odbc/test/odbc_connect_SUITE.erl
index 5727c1ca50..261dfc6f20 100644
--- a/lib/odbc/test/odbc_connect_SUITE.erl
+++ b/lib/odbc/test/odbc_connect_SUITE.erl
@@ -89,6 +89,7 @@ init_per_suite(Config) when is_list(Config) ->
 					    [{auto_commit, off}] ++ odbc_test_lib:platform_options()) of
 			{ok, Ref} ->
 			    odbc:disconnect(Ref),
+			    ct:timetrap(?default_timeout),
 			    [{tableName, odbc_test_lib:unique_table_name()} | Config];
 			_  ->
 			    {skip, "ODBC is not properly setup"}
@@ -129,11 +130,8 @@ init_per_testcase(_TestCase, Config) ->
     init_per_testcase_common(Config).
 
 init_per_testcase_common(Config) ->
-    test_server:format("ODBCINI = ~p~n", [os:getenv("ODBCINI")]),
-    Dog = test_server:timetrap(?default_timeout),
-    Temp = lists:keydelete(connection_ref, 1, Config),
-    NewConfig = lists:keydelete(watchdog, 1, Temp),
-    [{watchdog, Dog} | NewConfig].
+    ct:pal("ODBCINI = ~p~n", [os:getenv("ODBCINI")]),
+    lists:keydelete(connection_ref, 1, Config).
 
 %%--------------------------------------------------------------------
 %% Function: end_per_testcase(Case, Config) -> _
@@ -153,25 +151,22 @@ end_per_testcase(_TestCase, Config) ->
     end_per_testcase_common(Config).
 
 end_per_testcase_common(Config) ->
-    Table = ?config(tableName, Config),
+    Table = proplists:get_value(tableName, Config),
     {ok, Ref} = odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     Result = odbc:sql_query(Ref, "DROP TABLE " ++ Table),
     io:format("Drop table: ~p ~p~n", [Table, Result]),
-    odbc:disconnect(Ref),
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog).
+    odbc:disconnect(Ref).
 
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
-commit(doc)->
-    ["Test the use of explicit commit"];
-commit(suite) -> [];
+commit()->
+    [{doc,"Test the use of explicit commit"}].
 commit(Config)  ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), 
 			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
 
-    Table = ?config(tableName, Config),
+    Table = proplists:get_value(tableName, Config),
     TransStr = transaction_support_str(?RDBMS),
 
     {updated, _} = 
@@ -205,14 +200,13 @@ commit(Config)  ->
     ok = odbc:disconnect(Ref).
 %%-------------------------------------------------------------------------
 
-rollback(doc)->
-    ["Test the use of explicit rollback"];
-rollback(suite) -> [];
+rollback()->
+    [{doc,"Test the use of explicit rollback"}].
 rollback(Config)  ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
 
-    Table = ?config(tableName, Config),
+    Table = proplists:get_value(tableName, Config),
 
     TransStr = transaction_support_str(?RDBMS),
 
@@ -245,9 +239,8 @@ rollback(Config)  ->
     ok = odbc:disconnect(Ref).
 
 %%-------------------------------------------------------------------------
-not_explicit_commit(doc) ->
-    ["Test what happens if you try using commit on a auto_commit connection."];
-not_explicit_commit(suite) -> [];
+not_explicit_commit() ->
+    [{doc,"Test what happens if you try using commit on a auto_commit connection."}].
 not_explicit_commit(_Config) ->
     {ok, Ref} = 
 	odbc:connect(?RDBMS:connection_string(), [{auto_commit, on}] ++
@@ -256,19 +249,17 @@ not_explicit_commit(_Config) ->
     ok = odbc:disconnect(Ref).
 
 %%-------------------------------------------------------------------------
-not_exist_db(doc) ->
-    ["Tests valid data format but invalid data in the connection parameters."];
-not_exist_db(suite) -> [];
+not_exist_db() ->
+    [{doc,"Tests valid data format but invalid data in the connection parameters."}].
 not_exist_db(_Config)  ->
     {error, _} = odbc:connect("DSN=foo;UID=bar;PWD=foobar",
 			      odbc_test_lib:platform_options()),
     %% So that the odbc control server can be stoped "in the correct way"
-    test_server:sleep(100).
+    ct:sleep(100).
 
 %%-------------------------------------------------------------------------
-no_c_executable(doc) ->
-    "Test what happens if the port-program can not be found";
-no_c_executable(suite) -> [];
+no_c_executable() ->
+    [{doc,"Test what happens if the port-program can not be found"}].
 no_c_executable(_Config) ->
     process_flag(trap_exit, true),
     Dir = filename:nativename(filename:join(code:priv_dir(odbc), 
@@ -293,9 +284,8 @@ no_c_executable(_Config) ->
     end.
 %%------------------------------------------------------------------------
 
-port_dies(doc) ->
-    "Tests what happens if the port program dies";
-port_dies(suite) -> [];
+port_dies() ->
+    [{doc,"Tests what happens if the port program dies"}].
 port_dies(_Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     {status, _} = process_info(Ref, status),   
@@ -307,7 +297,7 @@ port_dies(_Config) ->
 	    %% Wait for exit_status from port 5000 ms (will not get a exit
 	    %% status in this case), then wait a little longer to make sure
 	    %% the port and the controlprocess has had time to terminate.
-	    test_server:sleep(10000),
+	    ct:sleep(10000),
 	    undefined = process_info(Ref, status);
 	[] ->
 	    ct:fail([erlang:port_info(P, name) || P <- erlang:ports()])  
@@ -315,9 +305,8 @@ port_dies(_Config) ->
 
 
 %%-------------------------------------------------------------------------
-control_process_dies(doc) ->
-    "Tests what happens if the Erlang control process dies";
-control_process_dies(suite) -> [];
+control_process_dies() ->
+    [{doc,"Tests what happens if the Erlang control process dies"}].
 control_process_dies(_Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     process_flag(trap_exit, true),
@@ -326,7 +315,7 @@ control_process_dies(_Config) ->
 	[Port] ->
 	    {connected, Ref} = erlang:port_info(Port, connected),  
 	    exit(Ref, kill),
-	    test_server:sleep(500),
+	    ct:sleep(500),
 	    undefined = erlang:port_info(Port, connected);
 	%% Check for c-program still running, how?
 	[] ->
@@ -334,9 +323,8 @@ control_process_dies(_Config) ->
     end.
 
 %%-------------------------------------------------------------------------
-client_dies_normal(doc) ->
-    ["Client dies with reason normal."];
-client_dies_normal(suite) -> [];
+client_dies_normal() ->
+    [{doc,"Client dies with reason normal."}].
 client_dies_normal(Config) when is_list(Config) ->
     Pid = spawn(?MODULE, client_normal, [self()]),
 
@@ -352,7 +340,7 @@ client_dies_normal(Config) when is_list(Config) ->
 	{'DOWN', MonitorReference, _Type, _Object, _Info} ->
 	    ok
     after 5000 ->
-	    test_server:fail(control_process_not_stopped)
+	    ct:fail(control_process_not_stopped)
     end.
 
 client_normal(Pid) ->
@@ -366,9 +354,8 @@ client_normal(Pid) ->
 
 
 %%-------------------------------------------------------------------------
-client_dies_timeout(doc) ->
-    ["Client dies with reason timeout."];
-client_dies_timeout(suite) -> [];
+client_dies_timeout() ->
+    [{doc,"Client dies with reason timeout."}].
 client_dies_timeout(Config) when is_list(Config) ->
     Pid = spawn(?MODULE, client_timeout, [self()]),
 
@@ -384,7 +371,7 @@ client_dies_timeout(Config) when is_list(Config) ->
 	{'DOWN', MonitorReference, _Type, _Object, _Info} ->
 	    ok
     after 5000 ->
-	    test_server:fail(control_process_not_stopped)
+	    ct:fail(control_process_not_stopped)
     end.
 
 client_timeout(Pid) ->
@@ -398,9 +385,8 @@ client_timeout(Pid) ->
 
 
 %%-------------------------------------------------------------------------
-client_dies_error(doc) ->
-    ["Client dies with reason error."];
-client_dies_error(suite) -> [];
+client_dies_error() ->
+    [{doc,"Client dies with reason error."}].
 client_dies_error(Config) when is_list(Config) ->
     Pid = spawn(?MODULE, client_error, [self()]),
 
@@ -416,7 +402,7 @@ client_dies_error(Config) when is_list(Config) ->
 	{'DOWN', MonitorReference, _Type, _Object, _Info} ->
 	    ok
     after 5000 ->
-	    test_server:fail(control_process_not_stopped)
+	    ct:fail(control_process_not_stopped)
     end.
 
 client_error(Pid) ->
@@ -430,9 +416,8 @@ client_error(Pid) ->
 
 
 %%-------------------------------------------------------------------------
-connect_timeout(doc) ->
-    ["Test the timeout for the connect function."];
-connect_timeout(suite) -> [];
+connect_timeout() ->
+    [{doc,"Test the timeout for the connect function."}].
 connect_timeout(Config) when is_list(Config) ->
     {'EXIT',timeout} = (catch odbc:connect(?RDBMS:connection_string(),
 					   [{timeout, 0}] ++
@@ -442,10 +427,9 @@ connect_timeout(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-connect_port_timeout(doc) ->
-    ["Test the timeout for the port program to connect back to the odbc "
-     "application within the connect function."];
-connect_port_timeout(suite) -> [];
+connect_port_timeout() ->
+    [{"Test the timeout for the port program to connect back to the odbc "
+     "application within the connect function."}].
 connect_port_timeout(Config) when is_list(Config) ->
     %% Application environment var 'port_timeout' has been set to 0 by
     %% init_per_testcase/2.
@@ -453,15 +437,14 @@ connect_port_timeout(Config) when is_list(Config) ->
                                    odbc_test_lib:platform_options()).
 
 %%-------------------------------------------------------------------------
-timeout(doc) ->
-    ["Test that timeouts don't cause unwanted behavior sush as receiving"
-     " an anwser to a previously tiemed out query."];
-timeout(suite) -> [];
+timeout() ->
+    [{"Test that timeouts don't cause unwanted behavior sush as receiving"
+     " an anwser to a previously tiemed out query."}].
 timeout(Config)  when is_list(Config) ->
 
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{auto_commit, off}]),
-    Table = ?config(tableName, Config),
+    Table = proplists:get_value(tableName, Config),
 
     TransStr = transaction_support_str(?RDBMS),
 
@@ -512,7 +495,7 @@ update_table_timeout(Table, TimeOut, Pid) ->
 	{'EXIT', timeout} ->
 	    Pid ! timout_occurred;
 	{updated, 1} ->
-	    test_server:fail(database_locker_failed)
+	    ct:fail(database_locker_failed)
     end,
 
     receive 
@@ -537,15 +520,14 @@ update_table_timeout(Table, TimeOut, Pid) ->
 
     ok = odbc:disconnect(Ref).
 %%-------------------------------------------------------------------------
-many_timeouts(doc) ->
-    ["Tests that many consecutive timeouts lead to that the connection "
-     "is shutdown."];
-many_timeouts(suite) -> [];
+many_timeouts() ->
+    [{doc, "Tests that many consecutive timeouts lead to that the connection "
+     "is shutdown."}].
 many_timeouts(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
 
-    Table = ?config(tableName, Config),
+    Table = proplists:get_value(tableName, Config),
     TransStr = transaction_support_str(?RDBMS),
 
     {updated, _} = 
@@ -592,19 +574,18 @@ loop_many_timouts(Ref, UpdateQuery, TimeOut) ->
 	{'EXIT',timeout} ->
 	    loop_many_timouts(Ref, UpdateQuery, TimeOut);
 	{updated, 1} ->
-	    test_server:fail(database_locker_failed);
+	    ct:fail(database_locker_failed);
 	{error, connection_closed} ->
 	    ok
     end.
 %%-------------------------------------------------------------------------
-timeout_reset(doc) ->
-    ["Check that the number of consecutive timouts is reset to 0 when "
-     "a successful call to the database is made."];
-timeout_reset(suite) -> [];
+timeout_reset() ->
+    [{doc, "Check that the number of consecutive timouts is reset to 0 when "
+      "a successful call to the database is made."}].
 timeout_reset(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
-    Table = ?config(tableName, Config),
+    Table = proplists:get_value(tableName, Config),
     TransStr = transaction_support_str(?RDBMS),
 
     {updated, _} = 
@@ -688,21 +669,20 @@ loop_timout_reset(Ref, UpdateQuery, TimeOut, NumTimeouts) ->
 	    loop_timout_reset(Ref, UpdateQuery, 
 			      TimeOut, NumTimeouts - 1);
 	{updated, 1} ->
-	    test_server:fail(database_locker_failed);
+	    ct:fail(database_locker_failed);
 	{error, connection_closed} ->
-	    test_server:fail(connection_closed_premature)
+	    ct:fail(connection_closed_premature)
     end.
 
 %%-------------------------------------------------------------------------
 
-disconnect_on_timeout(doc) ->
-    ["Check that disconnect after a time out works properly"]; 
-disconnect_on_timeout(suite) -> [];
+disconnect_on_timeout() ->
+    [{doc,"Check that disconnect after a time out works properly"}].
 disconnect_on_timeout(Config) when is_list(Config) ->
 
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
-    Table = ?config(tableName, Config),
+    Table = proplists:get_value(tableName, Config),
     TransStr = transaction_support_str(?RDBMS),
 
     {updated, _} = 
@@ -726,7 +706,7 @@ disconnect_on_timeout(Config) when is_list(Config) ->
 	ok ->
 	    ok = odbc:commit(Ref, commit);
 	nok ->
-	    test_server:fail(database_locker_failed)
+	    ct:fail(database_locker_failed)
     end.
 
 update_table_disconnect_on_timeout(Table, TimeOut, Pid) ->
@@ -744,14 +724,13 @@ update_table_disconnect_on_timeout(Table, TimeOut, Pid) ->
     end.
 
 %%-------------------------------------------------------------------------
-connection_closed(doc) ->
-    ["Checks that you get an appropriate error message if you try to"
-     " use a connection that has been closed"];
-connection_closed(suite) -> [];
+connection_closed() ->
+    [{doc, "Checks that you get an appropriate error message if you try to"
+     " use a connection that has been closed"}].
 connection_closed(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
 
-    Table = ?config(tableName, Config), 
+    Table = proplists:get_value(tableName, Config), 
     {updated, _} = 
 	odbc:sql_query(Ref, 
 		       "CREATE TABLE " ++ Table ++
@@ -771,14 +750,13 @@ connection_closed(Config) when is_list(Config) ->
     {error, connection_closed} = odbc:commit(Ref, commit).
 
 %%-------------------------------------------------------------------------
-disable_scrollable_cursors(doc) ->
-    ["Test disabling of scrollable cursors."];
-disable_scrollable_cursors(suite) -> [];
+disable_scrollable_cursors() ->
+    [{doc,"Test disabling of scrollable cursors."}].
 disable_scrollable_cursors(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{scrollable_cursors, off}]),
 
-    Table = ?config(tableName, Config),
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -792,10 +770,10 @@ disable_scrollable_cursors(Config) when is_list(Config) ->
 
     NextResult = ?RDBMS:selected_ID(1, next),
 
-    test_server:format("Expected: ~p~n", [NextResult]),
+    ct:pal("Expected: ~p~n", [NextResult]),
 
     Result = odbc:next(Ref),
-    test_server:format("Got: ~p~n", [Result]),
+    ct:pal("Got: ~p~n", [Result]),
     NextResult = Result,
 
     {error, scrollable_cursors_disabled} = odbc:first(Ref),
@@ -809,15 +787,14 @@ disable_scrollable_cursors(Config) when is_list(Config) ->
     {selected, _ColNames,[]} = odbc:select(Ref, next, 1).
 
 %%-------------------------------------------------------------------------
-return_rows_as_lists(doc)->
-    ["Test the option that a row may be returned as a list instead " 
-     "of a tuple. Too be somewhat backward compatible."];
-return_rows_as_lists(suite) -> [];
+return_rows_as_lists()->
+    [{doc,"Test the option that a row may be returned as a list instead " 
+     "of a tuple. Too be somewhat backward compatible."}].
 return_rows_as_lists(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
 			      [{tuple_row, off}] ++ odbc_test_lib:platform_options()),
 
-    Table = ?config(tableName, Config),
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -854,29 +831,28 @@ return_rows_as_lists(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-api_missuse(doc)->
-    ["Test that behaviour of the control process if the api is abused"];
-api_missuse(suite) -> [];
+api_missuse()->
+    [{doc,"Test that behaviour of the control process if the api is abused"}].
 api_missuse(Config) when is_list(Config)->
 
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     %% Serious programming fault, connetion will be shut down 
     gen_server:call(Ref, {self(), foobar, 10}, infinity),
-    test_server:sleep(10),
+    ct:sleep(10),
     undefined = process_info(Ref, status),
 
     {ok, Ref2} =  odbc:connect(?RDBMS:connection_string(),
 			       odbc_test_lib:platform_options()),
     %% Serious programming fault, connetion will be shut down 
     gen_server:cast(Ref2, {self(), foobar, 10}),
-    test_server:sleep(10),
+    ct:sleep(10),
     undefined = process_info(Ref2, status),
 
     {ok, Ref3} =  odbc:connect(?RDBMS:connection_string(),
 			       odbc_test_lib:platform_options()),
     %% Could be an innocent misstake the connection lives. 
     Ref3 ! foobar, 
-    test_server:sleep(10),
+    ct:sleep(10),
     {status, _} = process_info(Ref3, status).
 
 transaction_support_str(mysql) ->
@@ -886,13 +862,13 @@ transaction_support_str(_) ->
 
 
 %%-------------------------------------------------------------------------
-extended_errors(doc)->
-    ["Test the extended errors connection option: When off; the old behaviour of just an error "
-     "string is returned on error. When on, the error string is replaced by a 3 element tuple "
-     "that also exposes underlying ODBC provider error codes."];
-extended_errors(suite)  -> [];
+extended_errors()->
+    [{doc, 
+      "Test the extended errors connection option: When off; the old behaviour of just an error "
+      "string is returned on error. When on, the error string is replaced by a 3 element tuple "
+      "that also exposes underlying ODBC provider error codes."}].
 extended_errors(Config) when is_list(Config)->
-    Table = ?config(tableName, Config),
+    Table = proplists:get_value(tableName, Config),
     {ok, Ref} = odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     {updated, _} = odbc:sql_query(Ref, "create table " ++ Table ++" ( id integer, data varchar(10))"),
 
diff --git a/lib/odbc/test/odbc_data_type_SUITE.erl b/lib/odbc/test/odbc_data_type_SUITE.erl
index c88c00725e..a3a4bc78eb 100644
--- a/lib/odbc/test/odbc_data_type_SUITE.erl
+++ b/lib/odbc/test/odbc_data_type_SUITE.erl
@@ -120,6 +120,7 @@ init_per_suite(Config) when is_list(Config) ->
 	false ->
 	    case (catch odbc:start()) of
 		ok ->
+		    ct:timetrap(?default_timeout),
 		    [{tableName, odbc_test_lib:unique_table_name()}| Config];
 		_ ->
 		    {skip, "ODBC not startable"}
@@ -191,23 +192,22 @@ init_per_testcase(Case, Config) ->
 
 common_init_per_testcase(Case, Config) ->
     PlatformOptions = odbc_test_lib:platform_options(),
-    case atom_to_list(Case) of
-	"binary" ++ _  ->
-	    {ok, Ref} = odbc:connect(?RDBMS:connection_string(), 
-				     [{binary_strings, on}] ++ PlatformOptions);
-	LCase when LCase == "utf8";
-		   LCase == "nchar";
-		   LCase == "nvarchar" ->
-	    {ok, Ref} = odbc:connect(?RDBMS:connection_string(), 
-				     [{binary_strings, on}] ++ PlatformOptions);
-	_ ->
-	    {ok, Ref} = odbc:connect(?RDBMS:connection_string(), PlatformOptions)
-    end,
+    {ok, Ref} = 
+	case atom_to_list(Case) of
+	    "binary" ++ _  ->
+		odbc:connect(?RDBMS:connection_string(), 
+			     [{binary_strings, on}] ++ PlatformOptions);
+	    LCase when LCase == "utf8";
+		       LCase == "nchar";
+		       LCase == "nvarchar" ->
+		odbc:connect(?RDBMS:connection_string(), 
+			     [{binary_strings, on}] ++ PlatformOptions);
+	    _ ->
+		odbc:connect(?RDBMS:connection_string(), PlatformOptions)
+	end,
     odbc_test_lib:strict(Ref, ?RDBMS),
-    Dog = test_server:timetrap(?default_timeout),
-    Temp = lists:keydelete(connection_ref, 1, Config),
-    NewConfig = lists:keydelete(watchdog, 1, Temp),
-    [{watchdog, Dog}, {connection_ref, Ref} | NewConfig].
+    NewConfig = lists:keydelete(connection_ref, 1, Config),
+    [{connection_ref, Ref} | NewConfig].
 
 is_fixed_upper_limit(mysql) ->
     false;
@@ -231,28 +231,23 @@ is_supported_bit(_) ->
 %% Description: Cleanup after each test case
 %%--------------------------------------------------------------------
 end_per_testcase(_TestCase, Config) ->
-    Ref = ?config(connection_ref, Config),
+    Ref = proplists:get_value(connection_ref, Config),
     ok = odbc:disconnect(Ref),
     %% Clean up if needed 
-    Table = ?config(tableName, Config),
+    Table = proplists:get_value(tableName, Config),
     {ok, NewRef} = odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     odbc:sql_query(NewRef, "DROP TABLE " ++ Table), 
-    odbc:disconnect(NewRef),
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
+    odbc:disconnect(NewRef).
 
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
 
-char_fixed_lower_limit(doc) ->
-    ["Tests fixed length char data type lower boundaries."];
-char_fixed_lower_limit(suite) ->
-    [];
+char_fixed_lower_limit() ->
+    [{doc,"Tests fixed length char data type lower boundaries."}].
 char_fixed_lower_limit(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     %% Below limit
     {error, _} = 
@@ -287,18 +282,16 @@ char_fixed_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-char_fixed_upper_limit(doc) ->
-    ["Tests fixed length char data type upper boundaries."];
-char_fixed_upper_limit(suite) ->
-    [];
+char_fixed_upper_limit() ->
+    [{doc,"Tests fixed length char data type upper boundaries."}].
 char_fixed_upper_limit(Config) when is_list(Config) ->
 
     case ?RDBMS of
 	postgres ->
 	    {skip, "Limit unknown"};
 	_ ->
-	    Ref = ?config(connection_ref, Config),   
-	    Table = ?config(tableName, Config),
+	    Ref = proplists:get_value(connection_ref, Config),   
+	    Table = proplists:get_value(tableName, Config),
 	    
 	    %% Upper limit 
 	    {updated, _} =  % Value == 0 || -1 driver dependent!
@@ -337,14 +330,12 @@ char_fixed_upper_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-char_fixed_padding(doc) ->
-    ["Tests that data that is shorter than the given size is padded " 
-     "with blanks."];
-char_fixed_padding(suite) ->
-    [];
+char_fixed_padding() ->
+    [{doc, "Tests that data that is shorter than the given size is padded " 
+     "with blanks."}].
 char_fixed_padding(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     %% Data should be padded with blanks
     {updated, _} =  % Value == 0 || -1 driver dependent!
@@ -365,13 +356,11 @@ char_fixed_padding(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-varchar_lower_limit(doc) ->
-    ["Tests variable length char data type lower boundaries."];
-varchar_lower_limit(suite) ->
-    [];
+varchar_lower_limit() ->
+    [{doc,"Tests variable length char data type lower boundaries."}].
 varchar_lower_limit(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     %% Below limit
     {error, _} = 
@@ -405,13 +394,11 @@ varchar_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-varchar_upper_limit(doc) ->
-    ["Tests variable length char data type upper boundaries."];
-varchar_upper_limit(suite) ->
-    [];
+varchar_upper_limit() ->
+    [{doc,"Tests variable length char data type upper boundaries."}].
 varchar_upper_limit(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     case ?RDBMS of
 	oracle ->
@@ -455,14 +442,12 @@ varchar_upper_limit(Config) when is_list(Config) ->
     end.
 %%-------------------------------------------------------------------------
 
-varchar_no_padding(doc) ->
-    ["Tests that data that is shorter than the given max size is not padded " 
-     "with blanks."];
-varchar_no_padding(suite) ->
-    [];
+varchar_no_padding() ->
+    [{doc, "Tests that data that is shorter than the given max size is not padded " 
+     "with blanks."}].
 varchar_no_padding(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     %% Data should NOT be padded with blanks
     {updated, _} =  % Value == 0 || -1 driver dependent!
@@ -481,13 +466,11 @@ varchar_no_padding(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-text_lower_limit(doc) ->
-    ["Tests 'long' char data type lower boundaries."];
-text_lower_limit(suite) ->
-    [];
+text_lower_limit() ->
+    [{doc,"Tests 'long' char data type lower boundaries."}].
 text_lower_limit(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -504,15 +487,13 @@ text_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-text_upper_limit(doc) ->
-    [];
-text_upper_limit(suite) ->
-    [];
+text_upper_limit() ->
+    [{doc,"Tests 'text' char data type upper boundaries."}].
 text_upper_limit(Config) when is_list(Config) ->
     
     {skip,"Consumes too much resources" }.
-%%     Ref = ?config(connection_ref, Config),
-%%     Table = ?config(tableName, Config),
+%%     Ref = proplists:get_value(connection_ref, Config),
+%%     Table = proplists:get_value(tableName, Config),
 
 %%     {updated, _} =  % Value == 0 || -1 driver dependent!
 %% 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -534,13 +515,11 @@ text_upper_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-binary_char_fixed_lower_limit(doc) ->
-    ["Tests fixed length char data type lower boundaries."];
-binary_char_fixed_lower_limit(suite) ->
-    [];
+binary_char_fixed_lower_limit() ->
+    [{doc,"Tests fixed length char data type lower boundaries."}].
 binary_char_fixed_lower_limit(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     %% Below limit
     {error, _} = 
@@ -579,18 +558,16 @@ binary_char_fixed_lower_limit(Config) when is_list(Config) ->
 		       ++ "')").
 %%-------------------------------------------------------------------------
 
-binary_char_fixed_upper_limit(doc) ->
-    ["Tests fixed length char data type upper boundaries."];
-binary_char_fixed_upper_limit(suite) ->
-    [];
+binary_char_fixed_upper_limit() ->
+    [{doc,"Tests fixed length char data type upper boundaries."}].
 binary_char_fixed_upper_limit(Config) when is_list(Config) ->
 
     case ?RDBMS of
 	postgres ->
 	    {skip, "Limit unknown"};
 	_ ->
-	    Ref = ?config(connection_ref, Config),   
-	    Table = ?config(tableName, Config),
+	    Ref = proplists:get_value(connection_ref, Config),   
+	    Table = proplists:get_value(tableName, Config),
 	    
 	    %% Upper limit 
 	    {updated, _} =  % Value == 0 || -1 driver dependent!
@@ -630,14 +607,12 @@ binary_char_fixed_upper_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-binary_char_fixed_padding(doc) ->
-    ["Tests that data that is shorter than the given size is padded " 
-     "with blanks."];
-binary_char_fixed_padding(suite) ->
-    [];
+binary_char_fixed_padding() ->
+    [{doc, "Tests that data that is shorter than the given size is padded " 
+     "with blanks."}].
 binary_char_fixed_padding(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     %% Data should be padded with blanks
     {updated, _} =  % Value == 0 || -1 driver dependent!
@@ -658,13 +633,11 @@ binary_char_fixed_padding(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-binary_varchar_lower_limit(doc) ->
-    ["Tests variable length char data type lower boundaries."];
-binary_varchar_lower_limit(suite) ->
-    [];
+binary_varchar_lower_limit() ->
+    [{doc,"Tests variable length char data type lower boundaries."}].
 binary_varchar_lower_limit(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     %% Below limit
     {error, _} = 
@@ -701,13 +674,11 @@ binary_varchar_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-binary_varchar_upper_limit(doc) ->
-    ["Tests variable length char data type upper boundaries."];
-binary_varchar_upper_limit(suite) ->
-    [];
+binary_varchar_upper_limit() ->
+    [{doc,"Tests variable length char data type upper boundaries."}].
 binary_varchar_upper_limit(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     case ?RDBMS of
 	oracle ->
@@ -750,14 +721,12 @@ binary_varchar_upper_limit(Config) when is_list(Config) ->
     end.
 %%-------------------------------------------------------------------------
 
-binary_varchar_no_padding(doc) ->
-    ["Tests that data that is shorter than the given max size is not padded " 
-     "with blanks."];
-binary_varchar_no_padding(suite) ->
-    [];
+binary_varchar_no_padding() ->
+    [{doc,"Tests that data that is shorter than the given max size is not padded " 
+     "with blanks."}].
 binary_varchar_no_padding(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     %% Data should NOT be padded with blanks
     {updated, _} =  % Value == 0 || -1 driver dependent!
@@ -776,13 +745,11 @@ binary_varchar_no_padding(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-binary_text_lower_limit(doc) ->
-    ["Tests 'long' char data type lower boundaries."];
-binary_text_lower_limit(suite) ->
-    [];
+binary_text_lower_limit() ->
+    [{doc,"Tests 'long' char data type lower boundaries."}].
 binary_text_lower_limit(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -799,15 +766,13 @@ binary_text_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-binary_text_upper_limit(doc) ->
-    [];
-binary_text_upper_limit(suite) ->
-    [];
+binary_text_upper_limit() ->
+    [{doc,"Tests text char data type upper boundaries."}].
 binary_text_upper_limit(Config) when is_list(Config) ->
     
     {skip,"Consumes too much resources" }.
-%%     Ref = ?config(connection_ref, Config),
-%%     Table = ?config(tableName, Config),
+%%     Ref = proplists:get_value(connection_ref, Config),
+%%     Table = proplists:get_value(tableName, Config),
 
 %%     {updated, _} =  % Value == 0 || -1 driver dependent!
 %% 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -830,17 +795,15 @@ binary_text_upper_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-tiny_int_lower_limit(doc) ->
-    ["Tests integer of type tinyint."];
-tiny_int_lower_limit(suite) ->
-    [];
+tiny_int_lower_limit() ->
+    [{doc,"Tests integer of type tinyint."}].
 tiny_int_lower_limit(Config) when is_list(Config) -> 
     case ?RDBMS of
 	postgres ->
 	    {skip, "Type tiniyint not supported"};
 	_ ->
-	    Ref = ?config(connection_ref, Config),   
-	    Table = ?config(tableName, Config),
+	    Ref = proplists:get_value(connection_ref, Config),   
+	    Table = proplists:get_value(tableName, Config),
 	    
 	    {updated, _} =  % Value == 0 || -1 driver dependent!
 		odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -864,17 +827,15 @@ tiny_int_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-tiny_int_upper_limit(doc) ->
-    ["Tests integer of type tinyint."];
-tiny_int_upper_limit(suite) ->
-    [];
+tiny_int_upper_limit() ->
+    [{doc,"Tests integer of type tinyint."}].
 tiny_int_upper_limit(Config) when is_list(Config) ->
     case ?RDBMS of
 	postgres ->
 	    {skip, "Type tiniyint not supported"};
 	_ ->
-	    Ref = ?config(connection_ref, Config),   
-	    Table = ?config(tableName, Config),
+	    Ref = proplists:get_value(connection_ref, Config),   
+	    Table = proplists:get_value(tableName, Config),
 	    
 	    {updated, _} =  % Value == 0 || -1 driver dependent!
 		odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -898,13 +859,11 @@ tiny_int_upper_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-small_int_lower_limit(doc) ->
-    ["Tests integer of type smallint."];
-small_int_lower_limit(suite) ->
-    [];
+small_int_lower_limit() ->
+    [{doc,"Tests integer of type smallint."}].
 small_int_lower_limit(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -927,13 +886,11 @@ small_int_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-small_int_upper_limit(doc) ->
-    ["Tests integer of type smallint."];
-small_int_upper_limit(suite) ->
-    [];
+small_int_upper_limit() ->
+    [{doc,"Tests integer of type smallint."}].
 small_int_upper_limit(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -955,13 +912,11 @@ small_int_upper_limit(Config) when is_list(Config) ->
 		       ++ "')").
 
 %%-------------------------------------------------------------------------
-int_lower_limit(doc) ->
-    ["Tests integer of type int."];
-int_lower_limit(suite) ->
-    [];
+int_lower_limit() ->
+    [{doc,"Tests integer of type int."}].
 int_lower_limit(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -983,13 +938,11 @@ int_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-int_upper_limit(doc) ->
-    ["Tests integer of type int."];
-int_upper_limit(suite) ->
-    [];
+int_upper_limit() ->
+    [{doc,"Tests integer of type int."}].
 int_upper_limit(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref, "CREATE TABLE " ++ Table ++ 
@@ -1011,13 +964,11 @@ int_upper_limit(Config) when is_list(Config) ->
 
 
 %%-------------------------------------------------------------------------
-big_int_lower_limit(doc) ->
-    ["Tests integer of type bigint"];
-big_int_lower_limit(suite) ->
-    [];
+big_int_lower_limit() ->
+    [{doc,"Tests integer of type bigint"}].
 big_int_lower_limit(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -1040,13 +991,11 @@ big_int_lower_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-big_int_upper_limit(doc) ->
-    ["Tests integer of type bigint."];
-big_int_upper_limit(suite) ->
-    [];
+big_int_upper_limit() ->
+    [{doc,"Tests integer of type bigint."}].
 big_int_upper_limit(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -1068,17 +1017,13 @@ big_int_upper_limit(Config) when is_list(Config) ->
 		       ++ "')").
 %%-------------------------------------------------------------------------
 
-bit_false(doc) ->
-    [""];
-bit_false(suite) ->
-    [];
 bit_false(Config) when is_list(Config) ->  
     case ?RDBMS of
 	oracle ->
 	    {skip, "Not supported by driver"};
 	_ ->
-	    Ref = ?config(connection_ref, Config),   
-	    Table = ?config(tableName, Config),
+	    Ref = proplists:get_value(connection_ref, Config),   
+	    Table = proplists:get_value(tableName, Config),
 	    
 	    {updated, _} =  % Value == 0 || -1 driver dependent!
 		odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -1102,17 +1047,13 @@ bit_false(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-bit_true(doc) ->
-    [""];
-bit_true(suite) ->
-    [];
 bit_true(Config) when is_list(Config) ->
     case ?RDBMS of
 	oracle ->
 	    {skip, "Not supported by driver"};
 	_ ->
-	    Ref = ?config(connection_ref, Config),   
-	    Table = ?config(tableName, Config),
+	    Ref = proplists:get_value(connection_ref, Config),   
+	    Table = proplists:get_value(tableName, Config),
 	    
 	    
 	    {updated, _} =  % Value == 0 || -1 driver dependent!
@@ -1136,14 +1077,11 @@ bit_true(Config) when is_list(Config) ->
     end.
 
 %%-------------------------------------------------------------------------
-float_lower_limit(doc) ->
-    [""];
-float_lower_limit(suite) ->
-    [];
+
 float_lower_limit(Config) when is_list(Config) ->   
 
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     case ?RDBMS of
 	mysql ->
@@ -1186,13 +1124,10 @@ float_lower_limit(Config) when is_list(Config) ->
     end.
 
 %%-------------------------------------------------------------------------
-float_upper_limit(doc) ->
-    [""];
-float_upper_limit(suite) ->
-    [];
+
 float_upper_limit(Config) when is_list(Config) ->   
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     case ?RDBMS of
 	mysql ->
@@ -1218,13 +1153,11 @@ float_upper_limit(Config) when is_list(Config) ->
     end.
 
 %%-------------------------------------------------------------------------
-float_zero(doc) ->
-    ["Test the float value zero."];
-float_zero(suite) ->
-    [];
+float_zero() ->
+    [{doc,"Test the float value zero."}].
 float_zero(Config) when is_list(Config) ->   
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -1237,13 +1170,11 @@ float_zero(Config) when is_list(Config) ->
     SelectResult =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table).
 %%-------------------------------------------------------------------------
-real_zero(doc) ->
-    ["Test the real value zero."];
-real_zero(suite) ->
-    [];
+real_zero() ->
+    [{doc,"Test the real value zero."}].
 real_zero(Config) when is_list(Config) ->   
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     case ?RDBMS of
 	oracle ->
@@ -1262,13 +1193,11 @@ real_zero(Config) when is_list(Config) ->
 		odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table)
     end.
 %%------------------------------------------------------------------------
-dec_long(doc) ->
-    [""];
 dec_long(suit) ->
     [];
 dec_long(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -1281,13 +1210,11 @@ dec_long(Config) when is_list(Config) ->
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
     ["FIELD"] = odbc_test_lib:to_upper(Fields).
 %%------------------------------------------------------------------------
-dec_double(doc) ->
-    [""];
 dec_double(suit) ->
     [];
 dec_double(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -1329,13 +1256,11 @@ dec_double(Config) when is_list(Config) ->
     ["FIELD"] = odbc_test_lib:to_upper(Fields2).
 
 %%------------------------------------------------------------------------
-dec_bignum(doc) ->
-    [""];
 dec_bignum(suit) ->
     [];
 dec_bignum(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -1361,13 +1286,11 @@ dec_bignum(Config) when is_list(Config) ->
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
     ["FIELD"] = odbc_test_lib:to_upper(Fields1).
 %%------------------------------------------------------------------------
-num_long(doc) ->
-    [""];
 num_long(suit) ->
     [];
 num_long(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -1380,13 +1303,11 @@ num_long(Config) when is_list(Config) ->
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
     ["FIELD"] = odbc_test_lib:to_upper(Fields).
 %%------------------------------------------------------------------------
-num_double(doc) ->
-    [""];
 num_double(suit) ->
     [];
 num_double(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -1426,13 +1347,11 @@ num_double(Config) when is_list(Config) ->
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
      ["FIELD"] = odbc_test_lib:to_upper(Fields2).
 %%------------------------------------------------------------------------
-num_bignum(doc) ->
-    [""];
 num_bignum(suit) ->
     [];
 num_bignum(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -1459,13 +1378,13 @@ num_bignum(Config) when is_list(Config) ->
     ["FIELD"] = odbc_test_lib:to_upper(Fields1).
 
 %%------------------------------------------------------------------------
-utf8(doc) ->
-    ["Test unicode support"];
+utf8() ->
+    [{doc,"Test unicode support"}].
 utf8(suit) ->
     [];
 utf8(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
     
     odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ "(FIELD text)"),
 
@@ -1487,30 +1406,30 @@ utf8(Config) when is_list(Config) ->
 			  end,
 			  Latin1Data),
     
-    test_server:format("UnicodeIn: ~p ~n",[UnicodeIn]),
+    ct:pal("UnicodeIn: ~p ~n",[UnicodeIn]),
     {updated, _} = odbc:param_query(Ref,"INSERT INTO " ++ Table ++ "(FIELD) values(?)",
 				    [{{sql_varchar,50}, UnicodeIn}]),
     
     {selected,_,UnicodeOut} = odbc:sql_query(Ref,"SELECT * FROM " ++ Table),
 
-    test_server:format("UnicodeOut: ~p~n", [UnicodeOut]),
+    ct:pal("UnicodeOut: ~p~n", [UnicodeOut]),
      
     Result = lists:map(fun({Char}) ->
 			       unicode:characters_to_list(Char,utf8)
 		       end, UnicodeOut),
 
-    test_server:format("Result: ~p ~n", [Result]),
+    ct:pal("Result: ~p ~n", [Result]),
     
     Latin1Data = Result.
 %%------------------------------------------------------------------------
 
-nchar(doc) ->
-    ["Test unicode nchar support in sqlserver"];
+nchar() ->
+    [{doc,"Test unicode nchar support in sqlserver"}].
 nchar(suit) ->
     [];
 nchar(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++
@@ -1520,13 +1439,13 @@ nchar(Config) when is_list(Config) ->
 
 %%------------------------------------------------------------------------
 
-nvarchar(doc) ->
-    ["Test 'unicode' nvarchar support"];
+nvarchar() ->
+    [{doc,"Test 'unicode' nvarchar support"}].
 nvarchar(suit) ->
     [];
 nvarchar(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++
@@ -1535,13 +1454,11 @@ nvarchar(Config) when is_list(Config) ->
     w_char_support(Ref, Table, sql_wlongvarchar, 50).
 
 %%------------------------------------------------------------------------
-timestamp(doc) ->
-    [""];
 timestamp(suit) ->
     [];
 timestamp(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -1582,21 +1499,21 @@ w_char_support(Ref, Table, CharType, Size) ->
                           end,
                           Latin1Data),
 
-    test_server:format("UnicodeIn (utf 16): ~p ~n",[UnicodeIn]),
+    ct:pal("UnicodeIn (utf 16): ~p ~n",[UnicodeIn]),
 
     {updated, _} = odbc:param_query(Ref, "INSERT INTO " ++ Table ++ "(FIELD) values(?)",
 				    [{{CharType, Size},UnicodeIn}]),
 
     {selected,_,UnicodeOut} = odbc:sql_query(Ref,"SELECT * FROM " ++ Table),
 
-    test_server:format("UnicodeOut: ~p~n", [UnicodeOut]),
+    ct:pal("UnicodeOut: ~p~n", [UnicodeOut]),
 
     PadResult = lists:map(fun({Unicode}) ->
 			       unicode:characters_to_list(Unicode,{utf16,little})
 		       end,
 		       UnicodeOut),
 
-    test_server:format("Result: ~p~n", [PadResult]),
+    ct:pal("Result: ~p~n", [PadResult]),
 
     Result = lists:map(fun(Str) -> string:strip(Str) end, PadResult),
 
diff --git a/lib/odbc/test/odbc_query_SUITE.erl b/lib/odbc/test/odbc_query_SUITE.erl
index 5f719b7287..c283872965 100644
--- a/lib/odbc/test/odbc_query_SUITE.erl
+++ b/lib/odbc/test/odbc_query_SUITE.erl
@@ -113,6 +113,7 @@ init_per_suite(Config) when is_list(Config) ->
 	false ->
 	    case (catch odbc:start()) of
 		ok ->
+		    ct:timetrap(?default_timeout),
 		    [{tableName, odbc_test_lib:unique_table_name()}| Config];
 		_ ->
 		    {skip, "ODBC not startable"}
@@ -144,10 +145,10 @@ end_per_suite(_Config) ->
 init_per_testcase(_Case, Config) ->
     {ok, Ref} = odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     odbc_test_lib:strict(Ref, ?RDBMS),
-    Dog = test_server:timetrap(?default_timeout),
-    Temp = lists:keydelete(connection_ref, 1, Config),
-    NewConfig = lists:keydelete(watchdog, 1, Temp),
-    [{watchdog, Dog}, {connection_ref, Ref} | NewConfig].
+
+    NewConfig = lists:keydelete(connection_ref, 1, Config),
+
+    [{connection_ref, Ref} | NewConfig].
 
 %%--------------------------------------------------------------------
 %% Function: end_per_testcase(Case, Config) -> _
@@ -158,27 +159,23 @@ init_per_testcase(_Case, Config) ->
 %% Description: Cleanup after each test case
 %%--------------------------------------------------------------------
 end_per_testcase(_Case, Config) ->
-    Ref = ?config(connection_ref, Config),
+    Ref = proplists:get_value(connection_ref, Config),
     ok = odbc:disconnect(Ref),
     %% Clean up if needed 
-    Table = ?config(tableName, Config),
+    Table = proplists:get_value(tableName, Config),
     {ok, NewRef} = odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     odbc:sql_query(NewRef, "DROP TABLE " ++ Table), 
-    odbc:disconnect(NewRef),
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
+    odbc:disconnect(NewRef).
 
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
-stored_proc(doc)->
-    ["Test stored proc with OUT param"];
-stored_proc(suite) -> [];
+stored_proc()->
+    [{doc, "Test stored proc with OUT param"}].
 stored_proc(Config) when is_list(Config) ->
     case ?RDBMS of
         X when X == oracle; X == postgres->
-            Ref = ?config(connection_ref, Config),
+            Ref = proplists:get_value(connection_ref, Config),
             {updated, _} =
                 odbc:sql_query(Ref,
                                ?RDBMS:stored_proc_integer_out()),
@@ -192,12 +189,11 @@ stored_proc(Config) when is_list(Config) ->
 	    {skip, "stored proc not yet supported"}
     end.
 
-sql_query(doc)->
-    ["Test the common cases"];
-sql_query(suite) -> [];
+sql_query()->
+    [{doc, "Test the common cases"}].
 sql_query(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =
 	odbc:sql_query(Ref, 
@@ -235,14 +231,14 @@ sql_query(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-select_count(doc) -> 
-    ["Tests select_count/[2,3]'s timeout, "
-     " select_count's functionality will be better tested by other tests "
-     " such as first."];
+select_count() -> 
+    [{doc, "Tests select_count/[2,3]'s timeout, "
+	   " select_count's functionality will be better tested by other tests "
+      " such as first."}].
 select_count(sute) -> [];
 select_count(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = odbc:sql_query(Ref, 
 				  "CREATE TABLE " ++ Table ++
@@ -257,12 +253,11 @@ select_count(Config) when is_list(Config) ->
 	(catch odbc:select_count(Ref, "SELECT * FROM ", -1)),
     ok.
 %%-------------------------------------------------------------------------
-first(doc) ->
-    ["Tests first/[1,2]"];
-first(suite) -> [];
+first() ->
+    [doc, {"Tests first/[1,2]"}].
 first(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = odbc:sql_query(Ref, 
 				  "CREATE TABLE " ++ Table ++
@@ -284,12 +279,11 @@ first(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-last(doc) ->
-    ["Tests last/[1,2]"];
-last(suite) -> [];
+last() ->
+    [{doc, "Tests last/[1,2]"}].
 last(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = odbc:sql_query(Ref, 
 				  "CREATE TABLE " ++ Table ++
@@ -311,12 +305,11 @@ last(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-next(doc) ->
-    ["Tests next/[1,2]"];
-next(suite) -> [];
+next() ->
+    [{doc, "Tests next/[1,2]"}].
 next(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = odbc:sql_query(Ref, 
 				  "CREATE TABLE " ++ Table ++
@@ -337,12 +330,11 @@ next(Config) when is_list(Config) ->
     {'EXIT', {function_clause, _}} = (catch odbc:next(Ref, -1)),
     ok.
 %%-------------------------------------------------------------------------
-prev(doc) ->
-    ["Tests prev/[1,2]"];
-prev(suite) -> [];
+prev() ->
+    [{doc, "Tests prev/[1,2]"}].
 prev(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = odbc:sql_query(Ref, 
 				  "CREATE TABLE " ++ Table ++
@@ -366,12 +358,12 @@ prev(Config) when is_list(Config) ->
     {'EXIT', {function_clause, _}} = (catch odbc:prev(Ref, -1)),
     ok.
 %%-------------------------------------------------------------------------
-select_next(doc) ->
-    ["Tests select/[4,5] with CursorRelation = next "];
+select_next() ->
+    [{doc, "Tests select/[4,5] with CursorRelation = next "}].
 select_next(suit) -> [];
 select_next(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = odbc:sql_query(Ref, 
 				  "CREATE TABLE " ++ Table ++
@@ -407,12 +399,12 @@ select_next(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-select_relative(doc) ->
-    ["Tests select/[4,5] with CursorRelation = relative "];
+select_relative() ->
+    [{doc, "Tests select/[4,5] with CursorRelation = relative "}].
 select_relative(suit) -> [];
 select_relative(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = odbc:sql_query(Ref, 
 				  "CREATE TABLE " ++ Table ++
@@ -448,12 +440,12 @@ select_relative(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-select_absolute(doc) ->
-    ["Tests select/[4,5] with CursorRelation = absolute "];
+select_absolute() ->
+    [{doc, "Tests select/[4,5] with CursorRelation = absolute "}].
 select_absolute(suit) -> [];
 select_absolute(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = odbc:sql_query(Ref, 
 				  "CREATE TABLE " ++ Table ++
@@ -482,12 +474,11 @@ select_absolute(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-create_table_twice(doc) ->
-    ["Test what happens if you try to create the same table twice."];
-create_table_twice(suite) -> [];
+create_table_twice() ->
+    [{doc, "Test what happens if you try to create the same table twice."}].
 create_table_twice(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -501,12 +492,11 @@ create_table_twice(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-delete_table_twice(doc) ->
-    ["Test what happens if you try to delete the same table twice."];
-delete_table_twice(suite) -> [];
+delete_table_twice() ->
+    [{doc, "Test what happens if you try to delete the same table twice."}].
 delete_table_twice(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -518,12 +508,12 @@ delete_table_twice(Config) when is_list(Config) ->
     ok.
 
 %-------------------------------------------------------------------------
-duplicate_key(doc) ->
-    ["Test what happens if you try to use the same key twice"];
+duplicate_key() ->
+    [{doc, "Test what happens if you try to use the same key twice"}].
 duplicate_key(suit) -> [];
 duplicate_key(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -539,13 +529,12 @@ duplicate_key(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-not_connection_owner(doc) ->
-    ["Test what happens if a process that did not start the connection"
-     " tries to acess it."];
-not_connection_owner(suite) -> [];
+not_connection_owner() ->
+    [{doc, "Test what happens if a process that did not start the connection"
+	   " tries to acess it."}].
 not_connection_owner(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     spawn_link(?MODULE, not_owner, [self(), Ref, Table]),
 
@@ -564,12 +553,11 @@ not_owner(Pid, Ref, Table) ->
     Pid ! continue.
 
 %%-------------------------------------------------------------------------
-no_result_set(doc) ->
-    ["Tests what happens if you try to use a function that needs an "
-     "associated result set when there is none."];
-no_result_set(suite) -> [];
+no_result_set() ->
+    [{doc, "Tests what happens if you try to use a function that needs an "
+      "associated result set when there is none."}].
 no_result_set(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
+    Ref = proplists:get_value(connection_ref, Config),   
 
     {error, result_set_does_not_exist} = odbc:first(Ref),
     {error, result_set_does_not_exist} = odbc:last(Ref),
@@ -582,13 +570,11 @@ no_result_set(Config) when is_list(Config) ->
 	odbc:select(Ref, {relative, 2}, 1),
     ok.
 %%-------------------------------------------------------------------------
-query_error(doc) ->
-    ["Test what happens if there is an error in the query."];
-query_error(suite) ->
-    [];
+query_error() ->
+    [{doc, "Test what happens if there is an error in the query."}].
 query_error(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -605,15 +591,13 @@ query_error(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-multiple_select_result_sets(doc) ->
-    ["Test what happens if you have a batch of select queries."];
-multiple_select_result_sets(suite) ->
-    [];
+multiple_select_result_sets() ->
+    [{doc, "Test what happens if you have a batch of select queries."}].
 multiple_select_result_sets(Config) when is_list(Config) ->
     case ?RDBMS of
 	sqlserver ->
-	    Ref = ?config(connection_ref, Config),   
-	    Table = ?config(tableName, Config),
+	    Ref = proplists:get_value(connection_ref, Config),   
+	    Table = proplists:get_value(tableName, Config),
 	    
 	    {updated, _} = 
 		odbc:sql_query(Ref, 
@@ -640,16 +624,14 @@ multiple_select_result_sets(Config) when is_list(Config) ->
     end.
 	    
 %%-------------------------------------------------------------------------
-multiple_mix_result_sets(doc) ->
-    ["Test what happens if you have a batch of select and other type of"
-     " queries."];
-multiple_mix_result_sets(suite) ->
-    [];
+multiple_mix_result_sets() ->
+    [{doc, "Test what happens if you have a batch of select and other type of"
+      " queries."}].
 multiple_mix_result_sets(Config) when is_list(Config) ->
     case ?RDBMS of
 	sqlserver ->
-	    Ref = ?config(connection_ref, Config),   
-	    Table = ?config(tableName, Config),
+	    Ref = proplists:get_value(connection_ref, Config),   
+	    Table = proplists:get_value(tableName, Config),
 	    
 	    {updated, _} = 
 		odbc:sql_query(Ref, 
@@ -674,15 +656,13 @@ multiple_mix_result_sets(Config) when is_list(Config) ->
 	    {skip, "multiple result_set not supported"}
     end.
 %%-------------------------------------------------------------------------
-multiple_result_sets_error(doc) ->
-    ["Test what happens if one of the batched queries fails."];
-multiple_result_sets_error(suite) ->
-    [];
+multiple_result_sets_error() ->
+    [{doc, "Test what happens if one of the batched queries fails."}].
 multiple_result_sets_error(Config) when is_list(Config) ->
     case ?RDBMS of
 	sqlserver ->
-	    Ref = ?config(connection_ref, Config),   
-	    Table = ?config(tableName, Config),
+	    Ref = proplists:get_value(connection_ref, Config),   
+	    Table = proplists:get_value(tableName, Config),
 	    
 	    {updated, _} = 
 		odbc:sql_query(Ref, 
@@ -709,15 +689,13 @@ multiple_result_sets_error(Config) when is_list(Config) ->
     end.   
 
 %%-------------------------------------------------------------------------
-param_insert_tiny_int(doc)->
-    ["Test insertion of tiny ints by parameterized queries."];
-param_insert_tiny_int(suite) ->
-    [];
+param_insert_tiny_int()->
+    [{doc,"Test insertion of tiny ints by parameterized queries."}].
 param_insert_tiny_int(Config) when is_list(Config) ->
     case ?RDBMS of 
 	sqlserver ->
-	    Ref = ?config(connection_ref, Config),   
-	    Table = ?config(tableName, Config),
+	    Ref = proplists:get_value(connection_ref, Config),   
+	    Table = proplists:get_value(tableName, Config),
 	    
 	    {updated, _} = 
 		odbc:sql_query(Ref, 
@@ -746,13 +724,11 @@ param_insert_tiny_int(Config) when is_list(Config) ->
 	    {skip, "Type tiniyint not supported"}
     end.
 %%-------------------------------------------------------------------------
-param_insert_small_int(doc)->
-    ["Test insertion of small ints by parameterized queries."];
-param_insert_small_int(suite) ->
-    [];
+param_insert_small_int()->
+    [{doc,"Test insertion of small ints by parameterized queries."}].
 param_insert_small_int(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -778,13 +754,11 @@ param_insert_small_int(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_int(doc)->
-    ["Test insertion of ints by parameterized queries."];
-param_insert_int(suite) ->
-    [];
+param_insert_int()->
+    [{doc,"Test insertion of ints by parameterized queries."}].
 param_insert_int(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -810,13 +784,11 @@ param_insert_int(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_integer(doc)->
-    ["Test insertion of integers by parameterized queries."];
-param_insert_integer(suite) ->
-    [];
+param_insert_integer()->
+    [{doc,"Test insertion of integers by parameterized queries."}].
 param_insert_integer(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -842,13 +814,11 @@ param_insert_integer(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_decimal(doc)->
-    ["Test insertion of decimal numbers by parameterized queries."];
-param_insert_decimal(suite) ->
-    [];
+param_insert_decimal()->
+    [{doc,"Test insertion of decimal numbers by parameterized queries."}].
 param_insert_decimal(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -893,13 +863,11 @@ param_insert_decimal(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_numeric(doc)->
-    ["Test insertion of numeric numbers by parameterized queries."];
-param_insert_numeric(suite) ->
-    [];
+param_insert_numeric()->
+    [{doc,"Test insertion of numeric numbers by parameterized queries."}].
 param_insert_numeric(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -944,13 +912,11 @@ param_insert_numeric(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_char(doc)->
-    ["Test insertion of fixed length string by parameterized queries."];
-param_insert_char(suite) ->
-    [];
+param_insert_char()->
+    [{doc,"Test insertion of fixed length string by parameterized queries."}].
 param_insert_char(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -980,13 +946,11 @@ param_insert_char(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_character(doc)->
-    ["Test insertion of fixed length string by parameterized queries."];
-param_insert_character(suite) ->
-    [];
+param_insert_character()->
+    [{doc,"Test insertion of fixed length string by parameterized queries."}].
 param_insert_character(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1017,13 +981,11 @@ param_insert_character(Config) when is_list(Config) ->
     ok.
 
 %%------------------------------------------------------------------------
-param_insert_char_varying(doc)->
-    ["Test insertion of variable length strings by parameterized queries."];
-param_insert_char_varying(suite) ->
-    [];
+param_insert_char_varying()->
+    [{doc,"Test insertion of variable length strings by parameterized queries."}].
 param_insert_char_varying(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1054,13 +1016,11 @@ param_insert_char_varying(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_character_varying(doc)->
-    ["Test insertion of variable length strings by parameterized queries."];
-param_insert_character_varying(suite) ->
-    [];
+param_insert_character_varying()->
+    [{doc,"Test insertion of variable length strings by parameterized queries."}].
 param_insert_character_varying(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1091,13 +1051,11 @@ param_insert_character_varying(Config) when is_list(Config) ->
 				[{{sql_varchar, 10}, ["1", 2]}])), 
     ok.
 %%-------------------------------------------------------------------------
-param_insert_float(doc)->
-    ["Test insertion of floats by parameterized queries."];
-param_insert_float(suite) ->
-    [];
+param_insert_float()->
+    [{doc,"Test insertion of floats by parameterized queries."}].
 param_insert_float(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1120,7 +1078,7 @@ param_insert_float(Config) when is_list(Config) ->
 	true ->
 	    ok;
 	false ->
-	    test_server:fail(float_numbers_do_not_match)
+	    ct:fail(float_numbers_do_not_match)
     end,
 
     {'EXIT',{badarg,odbc,param_query,'Params'}} = 
@@ -1130,13 +1088,11 @@ param_insert_float(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_real(doc)->
-    ["Test insertion of real numbers by parameterized queries."];
-param_insert_real(suite) ->
-    [];
+param_insert_real()->
+    [{doc,"Test insertion of real numbers by parameterized queries."}].
 param_insert_real(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1161,7 +1117,7 @@ param_insert_real(Config) when is_list(Config) ->
 	true ->
 	    ok;
 	false ->
-	    test_server:fail(real_numbers_do_not_match)
+	    ct:fail(real_numbers_do_not_match)
     end,
 
     {'EXIT',{badarg,odbc,param_query,'Params'}} = 
@@ -1171,13 +1127,11 @@ param_insert_real(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_double(doc)->
-    ["Test insertion of doubles by parameterized queries."];
-param_insert_double(suite) ->
-    [];
+param_insert_double()->
+    [{doc,"Test insertion of doubles by parameterized queries."}].
 param_insert_double(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1200,7 +1154,7 @@ param_insert_double(Config) when is_list(Config) ->
 	true ->
 	    ok;
 	false ->
-	    test_server:fail(double_numbers_do_not_match)
+	    ct:fail(double_numbers_do_not_match)
     end,
 
     {'EXIT',{badarg,odbc,param_query,'Params'}} = 
@@ -1210,13 +1164,11 @@ param_insert_double(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_mix(doc)->
-    ["Test insertion of a mixture of datatypes by parameterized queries."];
-param_insert_mix(suite) ->
-    [];
+param_insert_mix()->
+    [{doc,"Test insertion of a mixture of datatypes by parameterized queries."}].
 param_insert_mix(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1237,13 +1189,11 @@ param_insert_mix(Config) when is_list(Config) ->
 	odbc:sql_query(Ref, "SELECT * FROM " ++ Table),
     ok.
 %%-------------------------------------------------------------------------
-param_update(doc)->
-    ["Test parameterized update query."];
-param_update(suite) ->
-    [];
+param_update()->
+    [{doc,"Test parameterized update query."}].
 param_update(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1272,12 +1222,12 @@ param_update(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-delete_nonexisting_row(doc) ->		% OTP-5759
-    ["Make a delete...where with false conditions (0 rows deleted). ",
-     "This used to give an error message (see ticket OTP-5759)."];
+delete_nonexisting_row() ->		% OTP-5759
+    [{doc, "Make a delete...where with false conditions (0 rows deleted). ",
+     "This used to give an error message (see ticket OTP-5759)."}].
 delete_nonexisting_row(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} =
 	odbc:sql_query(Ref, "CREATE TABLE " ++ Table
@@ -1301,13 +1251,11 @@ delete_nonexisting_row(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_delete(doc) ->
-    ["Test parameterized delete query."];
-param_delete(suite) ->
-    [];
+param_delete() ->
+    [{doc,"Test parameterized delete query."}].
 param_delete(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1336,13 +1284,11 @@ param_delete(Config) when is_list(Config) ->
 
 
 %%-------------------------------------------------------------------------
-param_select(doc) ->
-    ["Test parameterized select query."];
-param_select(suite) ->
-    [];
+param_select() ->
+    [{doc,"Test parameterized select query."}].
 param_select(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1366,13 +1312,11 @@ param_select(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_select_empty_params(doc) ->
-    ["Test parameterized select query with no parameters."];
-param_select_empty_params(suite) ->
-    [];
+param_select_empty_params() ->
+    [{doc,"Test parameterized select query with no parameters."}].
 param_select_empty_params(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1396,13 +1340,11 @@ param_select_empty_params(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_delete_empty_params(doc) ->
-    ["Test parameterized delete query with no parameters."];
-param_delete_empty_params(suite) ->
-    [];
+param_delete_empty_params() ->
+    [{doc,"Test parameterized delete query with no parameters."}].
 param_delete_empty_params(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1430,13 +1372,11 @@ param_delete_empty_params(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-describe_integer(doc) ->
-    ["Test describe_table/[2,3] for integer columns."];
-describe_integer(suite) ->
-    [];
+describe_integer() ->
+    [{doc,"Test describe_table/[2,3] for integer columns."}].
 describe_integer(Config) when is_list(Config) ->    
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1449,13 +1389,11 @@ describe_integer(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-describe_string(doc) ->
-    ["Test describe_table/[2,3] for string columns."];
-describe_string(suite) ->
-    [];
+describe_string() ->
+    [{doc,"Test describe_table/[2,3] for string columns."}].
 describe_string(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1470,13 +1408,11 @@ describe_string(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-describe_floating(doc) ->
-    ["Test describe_table/[2,3] for floting columns."];
-describe_floating(suite) ->
-    [];
+describe_floating() ->
+    [{doc,"Test describe_table/[2,3] for floting columns."}].
 describe_floating(Config) when is_list(Config) ->
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1490,14 +1426,12 @@ describe_floating(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-describe_dec_num(doc) ->
-    ["Test describe_table/[2,3] for decimal and numerical columns"];
-describe_dec_num(suite) ->
-    [];
+describe_dec_num() ->
+    [{doc,"Test describe_table/[2,3] for decimal and numerical columns"}].
 describe_dec_num(Config) when is_list(Config) ->
 
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
@@ -1511,14 +1445,12 @@ describe_dec_num(Config) when is_list(Config) ->
 
 
 %%-------------------------------------------------------------------------
-describe_timestamp(doc) ->
-    ["Test describe_table/[2,3] for tinmestap columns"];
-describe_timestamp(suite) ->
-    [];
+describe_timestamp() ->
+    [{doc,"Test describe_table/[2,3] for tinmestap columns"}].
 describe_timestamp(Config) when is_list(Config) ->
     
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
     
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
@@ -1530,14 +1462,12 @@ describe_timestamp(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-describe_no_such_table(doc) ->
-    ["Test what happens if you try to describe a table that does not exist."];
-describe_no_such_table(suite) ->
-    [];
+describe_no_such_table() ->
+    [{doc,"Test what happens if you try to describe a table that does not exist."}].
 describe_no_such_table(Config) when is_list(Config) ->
 
-    Ref = ?config(connection_ref, Config),   
-    Table = ?config(tableName, Config),
+    Ref = proplists:get_value(connection_ref, Config),   
+    Table = proplists:get_value(tableName, Config),
 
     {error, _ } = odbc:describe_table(Ref, Table),
     ok.
@@ -1549,10 +1479,10 @@ describe_no_such_table(Config) when is_list(Config) ->
 is_driver_error(Error) ->
     case is_list(Error) of
 	true ->
-	    test_server:format("Driver error ~p~n", [Error]),
+	    ct:pal("Driver error ~p~n", [Error]),
 	    ok;
 	false ->
-	    test_server:fail(Error)
+	    ct:fail(Error)
     end.
 is_supported_multiple_resultsets(sqlserver) ->
     true;
diff --git a/lib/odbc/test/odbc_start_SUITE.erl b/lib/odbc/test/odbc_start_SUITE.erl
index f055eeb60e..310b92ca29 100644
--- a/lib/odbc/test/odbc_start_SUITE.erl
+++ b/lib/odbc/test/odbc_start_SUITE.erl
@@ -49,6 +49,7 @@ init_per_suite(Config) ->
 		_ ->
 		    %% Make sure odbc is not already started
 		    odbc:stop(),
+		    ct:timetrap(?TIMEOUT),
 		    [{tableName, odbc_test_lib:unique_table_name()} | Config]
 	    end
     end.
@@ -74,11 +75,9 @@ end_per_suite(_Config) ->
 %% variable, but should NOT alter/remove any existing entries.
 %% Description: Initialization before each test case
 %%--------------------------------------------------------------------
-init_per_testcase(_TestCase, Config0) ->
-    test_server:format("ODBCINI = ~p~n", [os:getenv("ODBCINI")]),
-    Config = lists:keydelete(watchdog, 1, Config0),
-    Dog = test_server:timetrap(?TIMEOUT),
-    [{watchdog, Dog} | Config].
+init_per_testcase(_TestCase, Config) ->
+    ct:pal("ODBCINI = ~p~n", [os:getenv("ODBCINI")]),
+    Config.
 
 %%--------------------------------------------------------------------
 %% Function: end_per_testcase(TestCase, Config) -> _
@@ -88,15 +87,8 @@ init_per_testcase(_TestCase, Config0) ->
 %%   A list of key/value pairs, holding the test case configuration.
 %% Description: Cleanup after each test case
 %%--------------------------------------------------------------------
-end_per_testcase(_TestCase, Config) ->
-    Dog = ?config(watchdog, Config),
-    case Dog of 
-	undefined ->
-	    ok;
-	_ ->
-	    test_server:timetrap_cancel(Dog)
-    end.
-
+end_per_testcase(_TestCase, _Config) ->
+    ok.
 %%--------------------------------------------------------------------
 %% Function: all(Clause) -> TestCases
 %% Clause - atom() - suite | doc
@@ -135,10 +127,8 @@ app(Config) when is_list(Config) ->
 appup(Config) when is_list(Config) ->
     ok = ?t:appup_test(odbc).
 
-start(doc) -> 
-    ["Test start/stop of odbc"];
-start(suite) -> 
-    [];
+start() -> 
+    [{doc,"Test start/stop of odbc"}].
 start(Config) when is_list(Config) -> 
     PlatformOptions = odbc_test_lib:platform_options(),
 	{error,odbc_not_started} = odbc:connect(?RDBMS:connection_string(),
@@ -153,9 +143,9 @@ start(Config) when is_list(Config) ->
 	    start_odbc(transient),
 	    start_odbc(permanent);
 	{error, odbc_not_started} ->
-	    test_server:fail(start_failed);
+	    ct:fail(start_failed);
 	Error ->
-	    test_server:format("Connection failed: ~p~n", [Error]),
+	    ct:pal("Connection failed: ~p~n", [Error]),
 	    {skip, "ODBC is not properly setup"}
     end.
     
@@ -166,13 +156,12 @@ start_odbc(Type) ->
 	    ok = odbc:disconnect(Ref),
 	    odbc:stop();
 	{error, odbc_not_started} ->
-	    test_server:fail(start_failed)
+	    ct:fail(start_failed)
     end.
 
 
-long_connection_line(doc)->
-    ["Test a connection line longer than 127 characters"];
-long_connection_line(suite) -> [];
+long_connection_line()->
+    [{doc,"Test a connection line longer than 127 characters"}].
 long_connection_line(_Config)  ->
     odbc:start(),
     String133 = "unknown_odbc_parameter=01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789",
diff --git a/lib/odbc/test/odbc_test_lib.erl b/lib/odbc/test/odbc_test_lib.erl
index 37c2249303..cf82d4d32a 100644
--- a/lib/odbc/test/odbc_test_lib.erl
+++ b/lib/odbc/test/odbc_test_lib.erl
@@ -61,13 +61,13 @@ odbc_check() ->
     end.
 
 check_row_count(Count, Count) ->
-    test_server:format("Correct row count Count: ~p~n", [Count]),   
+    ct:pal("Correct row count Count: ~p~n", [Count]),   
     true;
 check_row_count(_, undefined) ->
-    test_server:format("Undefined row count ~n", []),  
+    ct:pal("Undefined row count ~n", []),  
     true;
 check_row_count(Expected, Count) ->
-    test_server:format("Incorrect row count Expected ~p Got ~p~n",
+    ct:pal("Incorrect row count Expected ~p Got ~p~n",
 		       [Expected, Count]),   
     false.