diff --git a/Unit_testing/BDL_Test_Customer.php b/Unit_testing/BDL_Test_Customer.php
index 29fdc3f..55ff7fa 100644
--- a/Unit_testing/BDL_Test_Customer.php
+++ b/Unit_testing/BDL_Test_Customer.php
@@ -12,44 +12,49 @@
 	public function getColumnList()
 	{
 		return array(
-			'CUSTOMER_ID'		=>	array(	'type'			=>	array( 'NUMBER', 'INTEGER' ),
+			'CUSTOMER_ID'		=>	array(	'generic_type'	=>	'NUMBER',
+											'sql_type'		=>	array( 'NUMBER', 'INTEGER' ),
 											'min_length'	=>	7,
 											'max_length'	=>	7,
 											'decimals'		=>	0,
-// 											'underflow'		=>	-1,
 											'nullable'		=>	false,
 											'test_value'	=>	"123456",	),
-			'NAME'				=>	array(	'type'			=>	array( 'VARCHAR2', 'VARCHAR' ),
+			'NAME'				=>	array(	'generic_type'	=>	'TEXT',
+											'sql_type'		=>	array( 'VARCHAR2', 'VARCHAR' ),
 											'min_length'	=>	50,
 											'max_length'	=>	50,
 											'nullable'		=>	false,
-											'test_value'	=>	"'Globodex'",	),
-			'CONTACT_PERSON'	=>	array(	'type'			=>	array( 'VARCHAR2', 'VARCHAR' ),
+											'test_value'	=>	"Globodex",	),
+			'CONTACT_PERSON'	=>	array(	'generic_type'	=>	'TEXT',
+											'sql_type'		=>	array( 'VARCHAR2', 'VARCHAR' ),
 											'min_length'	=>	50,
 											'max_length'	=>	50,
 											'nullable'		=>	true,
-											'test_value'	=>	"'Henrietta Bloggs'",	),
-			'PHONE'				=>	array(	'type'			=>	array( 'VARCHAR2', 'CHAR', 'VARCHAR' ),
+											'test_value'	=>	"Henrietta Bloggs",	),
+			'PHONE'				=>	array(	'generic_type'	=>	'TEXT',
+											'sql_type'		=>	array( 'VARCHAR2', 'CHAR', 'VARCHAR' ),
 											'min_length'	=>	11,
-											'max_length'	=>	15,
+											'max_length'	=>	20,
 											'nullable'		=>	false,
-											'test_value'	=>	"'64613998123'",
-											'legal_values'	=>	array( "'034511010'", "'2718391780'", "'+2496391734'", "'92819209365'" )),
-			'ADDRESS'			=>	array(	'type'			=>	array( 'VARCHAR2', 'VARCHAR' ),
+											'test_value'	=>	"64613998123",
+											'legal_values'	=>	array( "034511010", "2718391780", "+2496391734", "92819209365" )),
+			'ADDRESS'			=>	array(	'generic_type'	=>	'TEXT',
+											'sql_type'		=>	array( 'VARCHAR2', 'VARCHAR' ),
 											'min_length'	=>	200,
 											'max_length'	=>	200,
 											'nullable'		=>	false,
-											'test_value'	=>	"'12 Western Way'",	),
-			'EMAIL'				=>	array(	'type'			=>	array( 'VARCHAR2', 'VARCHAR' ),
+											'test_value'	=>	"12 Western Way",	),
+			'EMAIL'				=>	array(	'generic_type'	=>	'TEXT',
+											'sql_type'		=>	array( 'VARCHAR2', 'VARCHAR' ),
 											'min_length'	=>	50,
 											'max_length'	=>	50,
 											'nullable'		=>	true,
-											'test_value'	=>	"'henrietta@globodex.com'",	),
-			'COMMENTS'			=>	array(	'type'			=>	array( 'VARCHAR2', 'CLOB' ),
-											'min_length'	=>	1000,
-											'max_length'	=>	4000,
+											'test_value'	=>	"henrietta@globodex.com",	),
+			'COMMENTS'			=>	array(	'generic_type'	=>	'TEXT',
+											'sql_type'		=>	array( 'VARCHAR2', 'CLOB' ),
+											'min_length'	=>	500,
 											'nullable'		=>	true,
-											'test_value'	=>	"'Blah blah blah'",	),	);
+											'test_value'	=>	"Blah blah blah",	),	);
 	}