diff --git a/Unit_testing/BDL_Test_Staff.php b/Unit_testing/BDL_Test_Staff.php
index 3f20432..c6d9f08 100644
--- a/Unit_testing/BDL_Test_Staff.php
+++ b/Unit_testing/BDL_Test_Staff.php
@@ -12,68 +12,75 @@
 	public function getColumnList()
 	{
 		return array(
-			'STAFF_ID'		=>	array(	'type'			=>	array( 'NUMBER', 'INTEGER' ),
+			'STAFF_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",	),
-			'SURNAME'		=>	array(	'type'			=>	array( 'VARCHAR2', 'VARCHAR' ),
+			'SURNAME'		=>	array(	'generic_type'	=>	'TEXT',
+										'sql_type'		=>	array( 'VARCHAR2', 'VARCHAR' ),
 										'min_length'	=>	50,
 										'max_length'	=>	50,
 										'nullable'		=>	false,
-										'test_value'	=>	"'Bloggs'",	),
-			'FIRSTNAMES'	=>	array(	'type'			=>	array( 'VARCHAR2', 'VARCHAR' ),
+										'test_value'	=>	"Bloggs",	),
+			'FIRSTNAMES'	=>	array(	'generic_type'	=>	'TEXT',
+										'sql_type'		=>	array( 'VARCHAR2', 'VARCHAR' ),
 										'min_length'	=>	50,
 										'max_length'	=>	50,
 										'nullable'		=>	false,
-										'test_value'	=>	"'Harold'",	),
-			'PHONE'			=>	array(	'type'			=>	array( 'VARCHAR2', 'CHAR', 'VARCHAR' ),
+										'test_value'	=>	"Harold",	),
+			'PHONE'			=>	array(	'generic_type'	=>	'TEXT',
+										'sql_type'		=>	array( 'VARCHAR2', 'CHAR', 'VARCHAR' ),
 										'min_length'	=>	11,
-										'max_length'	=>	25,
+										'max_length'	=>	20,
 										'nullable'		=>	false,
-										'test_value'	=>	"'16139981234'",	),
-			'ADDRESS'		=>	array(	'type'			=>	array( 'VARCHAR2', 'VARCHAR' ),
+										'test_value'	=>	"16139981234",	),
+			'ADDRESS'		=>	array(	'generic_type'	=>	'TEXT',
+										'sql_type'		=>	array( 'VARCHAR2', 'VARCHAR' ),
 										'min_length'	=>	150,
 										'max_length'	=>	150,
 										'nullable'		=>	false,
-										'test_value'	=>	"'12 Western Way'",	),
-			'DEPARTMENT'	=>	array(	'type'			=>	array( 'VARCHAR2', 'VARCHAR' ),
+										'test_value'	=>	"12 Western Way",	),
+			'DEPARTMENT'	=>	array(	'generic_type'	=>	'TEXT',
+										'sql_type'		=>	array( 'VARCHAR2', 'VARCHAR' ),
 										'min_length'	=>	18,
-										'max_length'	=>	20,
+										'max_length'	=>	25,
 										'nullable'		=>	false,
 										'legal_values'	=> array(
-											"'Central Management'", "'Sales ' || chr(38) || ' Marketing'",
-											"'Personnel'", "'Manufacturing'", "'Inventory'", "'Accounts'"	),
-										'illegal_values' => array(	"'foobar'", "'blurk'", "'   '"	),
-										'test_value'	=>	"'Accounts'",	),
-			'POSITION'		=>	array(	'type'			=>	array( 'VARCHAR2', 'VARCHAR' ),
+											"Central Management", "Sales & Marketing", "Personnel",
+											"Manufacturing", "Inventory", "Accounts"	),
+										'illegal_values' => array(	"Sales and Marketing", "foobar", "blurk", "   "	),
+										'test_value'	=>	"Accounts",	),
+			'POSITION'		=>	array(	'generic_type'	=>	'TEXT',
+										'sql_type'		=>	array( 'VARCHAR2', 'VARCHAR' ),
 										'min_length'	=>	20,
-										'max_length'	=>	20,
+										'max_length'	=>	30,
 										'nullable'		=>	false,
 										'legal_values'	=> array(
-											"'CEO'", "'CTO'", "'CFO'", "'CIO'", "'Director'", "'President'",
-											"'Vice-President'", "'Manager'", "'Personal Assistant'",
-											"'Secretary'", "'Technician'", "'Researcher'", "'Designer'",
-											"'Assembler'", "'Programmer'", "'Contractor'",
-											"'Sales Representative'", "'Accountant'", "'Inventory'",
-											"'Assistant'"	),
-										'illegal_values' => array(	"'foobar'", "'blurk'", "'   '"	),
-										'test_value'	=>	"'CEO'",	),
-			'SALARY'		=>	array(	'type'			=>	array( 'NUMBER', 'DECIMAL' ),
+											"CEO", "CTO", "CFO", "CIO", "Director", "President", "Vice-President",
+											"Manager", "Personal Assistant", "Secretary", "Technician", "Researcher",
+											"Designer", "Assembler", "Programmer", "Contractor", "Sales Representative",
+											"Accountant", "Inventory", "Assistant"	),
+										'illegal_values' => array(	"barfoo", "blargh", "   "	),
+										'test_value'	=>	"CEO",	),
+			'SALARY'		=>	array(	'generic_type'	=>	'NUMBER',
+										'sql_type'		=>	array( 'NUMBER', 'DECIMAL' ),
 										'min_length'	=>	7,
 										'max_length'	=>	7,
 										'decimals'		=>	2,
-										'underflow'		=>	999.99,
-										'overflow'		=>	100000.00,
+										'underflow'		=>	"999.99",
+										'overflow'		=>	"100000",
 										'nullable'		=>	false,
-										'test_value'	=>	"50000.00",	),
-			'COMMENTS'		=>	array(	'type'			=>	array( 'VARCHAR2', 'CLOB' ),
-										'min_length'	=>	1000,
+										'test_value'	=>	"50000",	),
+			'COMMENTS'		=>	array(	'generic_type'	=>	'TEXT',
+										'sql_type'		=>	array( 'VARCHAR2', 'CLOB' ),
+										'min_length'	=>	500,
 										'max_length'	=>	4000,
 										'nullable'		=>	true,
-										'test_value'	=>	"'Blah blah blah'",	),	);
+										'test_value'	=>	"Blah blah blah",	),	);
 	}