diff --git a/tests/classes/DatabaseTest.php b/tests/classes/DatabaseTest.php
new file mode 100644
index 0000000..5c88f44
--- /dev/null
+++ b/tests/classes/DatabaseTest.php
@@ -0,0 +1,57 @@
+<?php
+
+class DatabaseTest extends PHPUnit_Framework_TestCase
+{
+	public function testGetInstanceFalse()
+	{
+		$this->assertFalse(Database::getInstance());
+	}
+
+	/**
+	 * @expectedException        Exception
+	 * @expectedExceptionMessage The specified datasource is not defined in the config.
+	 */
+	public function testGetInstanceDatasourceNotDefined()
+	{
+		$config = Config::getInstance();
+		$config->data['pickles']['datasource'] = 'mysql';
+		Database::getInstance();
+	}
+
+//	/**
+//	 * @expectedException        Exception
+//	 * @expectedExceptionMessage The specified datasource lacks a driver.
+//	 */
+//	public function testGetInstanceDatasourceLacksDriver()
+//	{
+//		$config = Config::getInstance();
+//		$config->data['datasources'] = [
+//			'mysql' => [
+//				'type' => 'mysql',
+//			],
+//		];
+//		$this->assertInstanceOf('Database', Database::getInstance());
+//	}
+//
+//	public function testGetInstanceDatasourcesArray()
+//	{
+//		$config = Config::getInstance();
+//		$config->data['datasources'] = [
+//			'mysql' => [
+//				'type'   => 'mysql',
+//				'driver' => 'pdo_mysql',
+//			],
+//		];
+//		$this->assertInstanceOf('Database', Database::getInstance());
+//	}
+
+//	public function testGetInstanceFirstDatasource()
+//	{
+//		$config = Config::getInstance();
+//		$config->data['pickles']['datasource'] = false;
+//
+//		//$this->assertInstanceOf('Database', Database::getInstance());
+//	}
+}
+
+?>
diff --git a/tests/classes/ModelTest.php b/tests/classes/ModelTest.php
index 51f0d3b..a5a87cc 100644
--- a/tests/classes/ModelTest.php
+++ b/tests/classes/ModelTest.php
@@ -6,12 +6,6 @@ class MockModelWithoutColumns extends Model
 	protected $columns = false;
 }
 
-class MockOtherModel extends Model
-{
-	protected $table   = 'brines';
-	protected $columns = false;
-}
-
 class MockModel extends Model
 {
 	protected $table   = 'pickles';
diff --git a/tests/schema.sql b/tests/schema.sql
index 1e1d1e0..4ee97f5 100644
--- a/tests/schema.sql
+++ b/tests/schema.sql
@@ -18,23 +18,6 @@ CREATE TABLE `pickles` (
   KEY is_deleted (is_deleted)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
-DROP TABLE IF EXISTS brines;
-
-CREATE TABLE `brines` (
-  `id` int(1) unsigned NOT NULL AUTO_INCREMENT,
-  `pickle_id` int(1) unsigned DEFAULT NULL,
-  `created_id` int(1) unsigned DEFAULT NULL,
-  `created_at` datetime NOT NULL,
-  `updated_id` int(1) unsigned DEFAULT NULL,
-  `updated_at` datetime DEFAULT NULL,
-  `deleted_id` int(1) unsigned DEFAULT NULL,
-  `deleted_at` datetime DEFAULT NULL,
-  `is_deleted` tinyint(1) unsigned DEFAULT '0',
-  PRIMARY KEY (`id`),
-  KEY pickle_id (pickle_id),
-  KEY is_deleted (is_deleted)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
 DROP TABLE IF EXISTS users;
 
 CREATE TABLE `users` (