odbc: Remove legacy config macros

4 files changed, 187 insertions, 187 deletions

diff --git a/lib/odbc/test/odbc_connect_SUITE.erl b/lib/odbc/test/odbc_connect_SUITE.erl
index 942750e4b1..6cbce7ceb9 100644
--- a/lib/odbc/test/odbc_connect_SUITE.erl
+++ b/lib/odbc/test/odbc_connect_SUITE.erl
@@ -153,12 +153,12 @@ 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),
+    Dog = proplists:get_value(watchdog, Config),
     test_server:timetrap_cancel(Dog).
 
 %%-------------------------------------------------------------------------
@@ -170,7 +170,7 @@ 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, _} = 
@@ -210,7 +210,7 @@ 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),
 
@@ -448,7 +448,7 @@ 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),
 
@@ -531,7 +531,7 @@ 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, _} = 
@@ -589,7 +589,7 @@ timeout_reset(doc) ->
 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, _} = 
@@ -686,7 +686,7 @@ 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, _} = 
@@ -734,7 +734,7 @@ connection_closed(doc) ->
 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 ++
@@ -760,7 +760,7 @@ 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, 
@@ -798,7 +798,7 @@ 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, 
@@ -871,7 +871,7 @@ extended_errors(doc)->
      "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 6dec8fa0a3..d3c530e035 100644
--- a/lib/odbc/test/odbc_data_type_SUITE.erl
+++ b/lib/odbc/test/odbc_data_type_SUITE.erl
@@ -231,14 +231,14 @@ 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),
+    Dog = proplists:get_value(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
@@ -249,8 +249,8 @@ end_per_testcase(_TestCase, Config) ->
 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, _} = 
@@ -293,8 +293,8 @@ char_fixed_upper_limit(Config) when is_list(Config) ->
 	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,8 +337,8 @@ 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!
@@ -362,8 +362,8 @@ char_fixed_padding(Config) when is_list(Config) ->
 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, _} = 
@@ -400,8 +400,8 @@ varchar_lower_limit(Config) when is_list(Config) ->
 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 ->
@@ -449,8 +449,8 @@ 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!
@@ -472,8 +472,8 @@ varchar_no_padding(Config) when is_list(Config) ->
 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 ++ 
@@ -495,8 +495,8 @@ text_upper_limit(doc) ->
 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 ++ 
@@ -521,8 +521,8 @@ 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(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, _} = 
@@ -569,8 +569,8 @@ binary_char_fixed_upper_limit(Config) when is_list(Config) ->
 	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!
@@ -614,8 +614,8 @@ 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!
@@ -639,8 +639,8 @@ 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(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, _} = 
@@ -680,8 +680,8 @@ 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(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 ->
@@ -728,8 +728,8 @@ 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!
@@ -751,8 +751,8 @@ 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(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 ++ 
@@ -774,8 +774,8 @@ binary_text_upper_limit(doc) ->
 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 ++ 
@@ -805,8 +805,8 @@ tiny_int_lower_limit(Config) when is_list(Config) ->
 	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 ++ 
@@ -837,8 +837,8 @@ tiny_int_upper_limit(Config) when is_list(Config) ->
 	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 ++ 
@@ -865,8 +865,8 @@ tiny_int_upper_limit(Config) when is_list(Config) ->
 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 ++ 
@@ -892,8 +892,8 @@ small_int_lower_limit(Config) when is_list(Config) ->
 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 ++ 
@@ -918,8 +918,8 @@ small_int_upper_limit(Config) when is_list(Config) ->
 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 ++ 
@@ -944,8 +944,8 @@ int_lower_limit(Config) when is_list(Config) ->
 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 ++ 
@@ -970,8 +970,8 @@ int_upper_limit(Config) when is_list(Config) ->
 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 ++ 
@@ -997,8 +997,8 @@ big_int_lower_limit(Config) when is_list(Config) ->
 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 ++ 
@@ -1027,8 +1027,8 @@ bit_false(Config) when is_list(Config) ->
 	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 ++ 
@@ -1059,8 +1059,8 @@ bit_true(Config) when is_list(Config) ->
 	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!
@@ -1088,8 +1088,8 @@ float_lower_limit(doc) ->
     [""];
 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 ->
@@ -1135,8 +1135,8 @@ float_lower_limit(Config) when is_list(Config) ->
 float_upper_limit(doc) ->
     [""];
 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 ->
@@ -1165,8 +1165,8 @@ float_upper_limit(Config) when is_list(Config) ->
 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 ++ 
@@ -1182,8 +1182,8 @@ float_zero(Config) when is_list(Config) ->
 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 ->
@@ -1207,8 +1207,8 @@ 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 ++ 
@@ -1226,8 +1226,8 @@ 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 ++ 
@@ -1274,8 +1274,8 @@ 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 ++ 
@@ -1306,8 +1306,8 @@ 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 ++ 
@@ -1325,8 +1325,8 @@ 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 ++ 
@@ -1371,8 +1371,8 @@ 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 ++ 
@@ -1404,8 +1404,8 @@ utf8(doc) ->
 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)"),
 
@@ -1449,8 +1449,8 @@ nchar(doc) ->
 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 ++
@@ -1465,8 +1465,8 @@ nvarchar(doc) ->
 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 ++
@@ -1480,8 +1480,8 @@ 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 ++ 
diff --git a/lib/odbc/test/odbc_query_SUITE.erl b/lib/odbc/test/odbc_query_SUITE.erl
index 8a5c6bdd73..f48468dc47 100644
--- a/lib/odbc/test/odbc_query_SUITE.erl
+++ b/lib/odbc/test/odbc_query_SUITE.erl
@@ -158,14 +158,14 @@ 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),
+    Dog = proplists:get_value(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
@@ -177,7 +177,7 @@ stored_proc(doc)->
 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()),
@@ -194,8 +194,8 @@ stored_proc(Config) when is_list(Config) ->
 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, 
@@ -239,8 +239,8 @@ select_count(doc) ->
      " 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 ++
@@ -258,8 +258,8 @@ select_count(Config) when is_list(Config) ->
 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,8 +284,8 @@ first(Config) when is_list(Config) ->
 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 ++
@@ -310,8 +310,8 @@ last(Config) when is_list(Config) ->
 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 ++
@@ -335,8 +335,8 @@ next(Config) when is_list(Config) ->
 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 ++
@@ -364,8 +364,8 @@ 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 ++
@@ -405,8 +405,8 @@ 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 ++
@@ -446,8 +446,8 @@ 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 ++
@@ -479,8 +479,8 @@ select_absolute(Config) when is_list(Config) ->
 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, 
@@ -497,8 +497,8 @@ create_table_twice(Config) when is_list(Config) ->
 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, 
@@ -514,8 +514,8 @@ 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, 
@@ -535,8 +535,8 @@ 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]),
 
@@ -559,7 +559,7 @@ 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),
@@ -575,8 +575,8 @@ no_result_set(Config) when is_list(Config) ->
 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, 
@@ -598,8 +598,8 @@ multiple_select_result_sets(doc) ->
 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, 
@@ -632,8 +632,8 @@ multiple_mix_result_sets(doc) ->
 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, 
@@ -663,8 +663,8 @@ multiple_result_sets_error(doc) ->
 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, 
@@ -696,8 +696,8 @@ param_insert_tiny_int(doc)->
 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, 
@@ -729,8 +729,8 @@ param_insert_tiny_int(Config) when is_list(Config) ->
 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, 
@@ -759,8 +759,8 @@ param_insert_small_int(Config) when is_list(Config) ->
 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, 
@@ -789,8 +789,8 @@ param_insert_int(Config) when is_list(Config) ->
 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, 
@@ -819,8 +819,8 @@ param_insert_integer(Config) when is_list(Config) ->
 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, 
@@ -868,8 +868,8 @@ param_insert_decimal(Config) when is_list(Config) ->
 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, 
@@ -917,8 +917,8 @@ param_insert_numeric(Config) when is_list(Config) ->
 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, 
@@ -951,8 +951,8 @@ param_insert_char(Config) when is_list(Config) ->
 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, 
@@ -986,8 +986,8 @@ param_insert_character(Config) when is_list(Config) ->
 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, 
@@ -1021,8 +1021,8 @@ param_insert_char_varying(Config) when is_list(Config) ->
 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, 
@@ -1056,8 +1056,8 @@ param_insert_character_varying(Config) when is_list(Config) ->
 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, 
@@ -1093,8 +1093,8 @@ param_insert_float(Config) when is_list(Config) ->
 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, 
@@ -1132,8 +1132,8 @@ param_insert_real(Config) when is_list(Config) ->
 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, 
@@ -1169,8 +1169,8 @@ param_insert_double(Config) when is_list(Config) ->
 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, 
@@ -1194,8 +1194,8 @@ param_insert_mix(Config) when is_list(Config) ->
 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, 
@@ -1228,8 +1228,8 @@ 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(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
@@ -1256,8 +1256,8 @@ delete_nonexisting_row(Config) when is_list(Config) ->
 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, 
@@ -1289,8 +1289,8 @@ param_delete(Config) when is_list(Config) ->
 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, 
@@ -1317,8 +1317,8 @@ param_select(Config) when is_list(Config) ->
 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, 
@@ -1345,8 +1345,8 @@ param_select_empty_params(Config) when is_list(Config) ->
 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, 
@@ -1377,8 +1377,8 @@ param_delete_empty_params(Config) when is_list(Config) ->
 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, 
@@ -1394,8 +1394,8 @@ describe_integer(Config) when is_list(Config) ->
 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, 
@@ -1413,8 +1413,8 @@ describe_string(Config) when is_list(Config) ->
 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, 
@@ -1432,8 +1432,8 @@ 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, 
@@ -1451,8 +1451,8 @@ 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 ++ 
@@ -1468,8 +1468,8 @@ 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.
diff --git a/lib/odbc/test/odbc_start_SUITE.erl b/lib/odbc/test/odbc_start_SUITE.erl
index 670e498142..ff89a22f3d 100644
--- a/lib/odbc/test/odbc_start_SUITE.erl
+++ b/lib/odbc/test/odbc_start_SUITE.erl
@@ -89,7 +89,7 @@ init_per_testcase(_TestCase, Config0) ->
 %% Description: Cleanup after each test case
 %%--------------------------------------------------------------------
 end_per_testcase(_TestCase, Config) ->
-    Dog = ?config(watchdog, Config),
+    Dog = proplists:get_value(watchdog, Config),
     case Dog of 
 	undefined ->
 	    ok;