diff --git a/tests/adapters/mysql2_test.js b/tests/adapters/mysql2_test.js
index 534445c..4ac950b 100644
--- a/tests/adapters/mysql2_test.js
+++ b/tests/adapters/mysql2_test.js
@@ -23,7 +23,8 @@ testBase._setUp(qb, function(test, err, rows) {
 		throw new Error(err);
 	}
 
-	test.ok(rows);
+	test.ok(rows, 'Valid result for generated query');
+	test.done();
 });
 
 // Export the final test object
diff --git a/tests/adapters/mysql_test.js b/tests/adapters/mysql_test.js
index 7c843d2..fc20569 100644
--- a/tests/adapters/mysql_test.js
+++ b/tests/adapters/mysql_test.js
@@ -23,7 +23,8 @@ testBase._setUp(qb, function(test, err, rows) {
 		throw new Error(err);
 	}
 
-	test.ok(rows);
+	test.ok(rows, 'Valid result for generated query');
+	test.done();
 });
 
 tests["mysql adapter with query builder"] = function(test) {
diff --git a/tests/adapters/pg_test.js b/tests/adapters/pg_test_skip.js
similarity index 90%
rename from tests/adapters/pg_test.js
rename to tests/adapters/pg_test_skip.js
index 64e5283..88a9eac 100644
--- a/tests/adapters/pg_test.js
+++ b/tests/adapters/pg_test_skip.js
@@ -19,12 +19,12 @@ var qb = nodeQuery('pg', connection, adapterName);
 
 
 // Set up the test base
-testBase._setUp(qb, function(test, err, rows) {
+testBase._setUp(qb, function(test, err, result) {
 	if (err) {
 		throw new Error(err);
 	}
 
-	test.ok(rows);
+	test.ok.call(test, result);
 });
 
 // Export the final test object
diff --git a/tests/query-builder-base.js b/tests/query-builder-base.js
index 39b5918..c9a16a2 100644
--- a/tests/query-builder-base.js
+++ b/tests/query-builder-base.js
@@ -19,31 +19,36 @@ module.exports = (function()  {
 	 * Generic query builder tests
 	 */
 	base.tests = {
+		// ! Get tests
 		'Get tests' : {
 			'Get with function': function(test) {
 				base.qb.select('id, COUNT(id) as count')
 					.from('create_test')
 					.groupBy('id')
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			},
 			'Basic select all get': function(test) {
-				base.qb.get('create_test', base.testCallback.bind(test, test));
-				test.done();
+				base.qb.get('create_test', base.testCallback.bind(null, test));
+
+
 			},
 			'Basic select all with from': function(test) {
 				base.qb.from('create_test')
-					.get(base.testCallback.bind(test, test));
-				test.done();
+					.get(base.testCallback.bind(null, test));
+
+
 			},
 			'Get with limit': function(test) {
-				base.qb.get('create_test', 2, base.testCallback.bind(test, test));
-				test.done();
+				base.qb.get('create_test', 2, base.testCallback.bind(null, test));
+
+
 			},
 			'Get with limit and offset': function(test) {
-				base.qb.get('create_test', 2, 1, base.testCallback.bind(test, test));
-				test.done();
+				base.qb.get('create_test', 2, 1, base.testCallback.bind(null, test));
+
+
 			},
 			'Test get with having': function(test) {
 				base.qb.select('id')
@@ -51,9 +56,9 @@ module.exports = (function()  {
 					.groupBy('id')
 					.having({'id >':1})
 					.having('id !=', 3)
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			},
 			"Test get with 'orHaving'": function(test) {
 				base.qb.select('id')
@@ -61,55 +66,56 @@ module.exports = (function()  {
 					.groupBy('id')
 					.having({'id >':1})
 					.orHaving('id !=', 3)
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			}
 		},
+		// ! Select tests
 		'Select tests' : {
 			'Select where get': function(test) {
 				base.qb.select(['id', 'key as k', 'val'])
 					.where('id >', 1)
 					.where('id <', 900)
-					.get('create_test', 2, 1, base.testCallback.bind(test, test));
-
+					.get('create_test', 2, 1, base.testCallback.bind(null, test));
+			},
+			'Select where get 2': function(test) {
 				base.qb.select('id, key as k, val')
 					.where('id !=', 1)
-					.get('create_test', 2, 1, base.testCallback.bind(test, test));
-
-				test.done();
+					.get('create_test', 2, 1, base.testCallback.bind(null, test));
 			},
 			'Multi Order By': function(test) {
 				base.qb.from('create_test')
 					.orderBy('id, key')
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			},
 			'Select get': function(test) {
 				base.qb.select('id, key as k, val')
-					.get('create_test', 2, 1, base.testCallback.bind(test, test));
+					.get('create_test', 2, 1, base.testCallback.bind(null, test));
+
 
-				test.done();
 			},
 			'Select from get': function(test) {
 				base.qb.select('id, key as k, val')
 					.from('create_test ct')
 					.where('id >', 1)
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			},
 			'Select from limit get': function(test) {
 				base.qb.select('id, key as k, val')
 					.from('create_test ct')
 					.where('id >', 1)
 					.limit(3)
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			}
 		},
+		// ! Grouping tests
 		'Grouping tests' : {
 			'Using grouping method': function(test) {
 				base.qb.select('id, key as k, val')
@@ -119,9 +125,9 @@ module.exports = (function()  {
 					.where('id <', 900)
 					.groupEnd()
 					.limit(2, 1)
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			},
 			'Using or grouping method': function(test) {
 				base.qb.select('id, key as k, val')
@@ -134,9 +140,9 @@ module.exports = (function()  {
 					.where('id', 0)
 					.groupEnd()
 					.limit(2, 1)
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			},
 			'Using or not grouping method': function(test) {
 				base.qb.select('id, key as k, val')
@@ -149,44 +155,46 @@ module.exports = (function()  {
 					.where('id', 0)
 					.groupEnd()
 					.limit(2, 1)
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			}
 		},
+		// ! Where in tests
 		'Where in tests' : {
 			'Where in': function(test) {
 				base.qb.from('create_test')
 					.whereIn('id', [0, 6, 56, 563, 341])
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			},
 			'Or Where in': function(test) {
 				base.qb.from('create_test')
 					.where('key', 'false')
 					.orWhereIn('id', [0, 6, 56, 563, 341])
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			},
 			'Where Not in': function(test) {
 				base.qb.from('create_test')
 					.where('key', 'false')
 					.whereNotIn('id', [0, 6, 56, 563, 341])
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			},
 			'Or Where Not in': function(test) {
 				base.qb.from('create_test')
 					.where('key', 'false')
 					.orWhereNotIn('id', [0, 6, 56, 563, 341])
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			}
 		},
+		// ! Query modifier testss
 		'Query modifier tests': {
 			'Order By': function(test) {
 				base.qb.select('id, key as k, val')
@@ -196,9 +204,9 @@ module.exports = (function()  {
 					.orderBy('id', 'DESC')
 					.orderBy('k', "ASC")
 					.limit(5, 2)
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			},
 			'Group by': function(test) {
 				base.qb.select('id, key as k, val')
@@ -210,9 +218,9 @@ module.exports = (function()  {
 					.orderBy('id', 'DESC')
 					.orderBy('k', "ASC")
 					.limit(5, 2)
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			},
 			'Or Where': function(test) {
 				base.qb.select('id, key as k, val')
@@ -220,25 +228,60 @@ module.exports = (function()  {
 					.where(' id ', 1)
 					.orWhere('key >', 0)
 					.limit(2, 1)
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			},
 			'Like' : function(test) {
 				base.qb.from('create_test')
 					.like('key', 'og')
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
+
 
-				test.done();
 			},
 			'Or Like': function(test) {
 				base.qb.from('create_test')
 					.like('key', 'og')
 					.orLike('key', 'val')
-					.get(base.testCallback.bind(test, test));
+					.get(base.testCallback.bind(null, test));
 
-				test.done();
-			}
+
+			},
+			'Not Like': function(test) {
+				base.qb.from('create_test')
+					.like('key', 'og', 'before')
+					.notLike('key', 'val')
+					.get(base.testCallback.bind(null, test));
+
+
+			},
+			'Or Not Like': function(test) {
+				base.qb.from('create_test')
+					.like('key', 'og', 'before')
+					.orNotLike('key', 'val')
+					.get(base.testCallback.bind(null, test));
+
+
+			},
+			'Like Before': function(test) {
+				base.qb.from('create_test')
+					.like('key', 'og', 'before')
+					.get(base.testCallback.bind(null, test));
+
+
+			},
+			'Like After': function(test) {
+				base.qb.from('create_test')
+					.like('key', 'og', 'after')
+					.get(base.testCallback.bind(null, test));
+
+
+			}/*,
+			'Basic Join': function(test) {
+				base.qb.from('create_test ct')
+					.join('create_join cj', 'cj.id', '=', 'ct.id', 'left')
+					.get(base.testCallback.bind(null, test));
+			}*/
 		},
 		'DB update tests' : {