diff --git a/src/databases/firebird.php b/src/databases/firebird.php
index b216980..beb2125 100644
--- a/src/databases/firebird.php
+++ b/src/databases/firebird.php
@@ -19,7 +19,7 @@
  */
 class firebird extends DB_PDO {
 
-	protected $conn, $statement, $trans, $count;
+	protected $conn, $statement, $trans, $count, $result;
 	private $esc_char = "''";
 	
 	/**
@@ -90,13 +90,6 @@ class firebird extends DB_PDO {
 				return ibase_fetch_row($this->statement, IBASE_FETCH_BLOBS);
 			break;
 
-			case PDO::FETCH_BOTH:
-				return array_merge(
-					ibase_fetch_row($this->statement, IBASE_FETCH_BLOBS),
-					ibase_fetch_assoc($this->statement, IBASE_FETCH_BLOBS)
-				);
-			break;
-
 			default:
 				return ibase_fetch_assoc($this->statement, IBASE_FETCH_BLOBS);
 			break;
@@ -117,6 +110,8 @@ class firebird extends DB_PDO {
 		{
 			$all[] = $row;
 		}
+		
+		$this->result = $all;
 
 		return $all;
 	}
diff --git a/tests/databases/firebird.php b/tests/databases/firebird.php
index 1842f9a..1562fb3 100644
--- a/tests/databases/firebird.php
+++ b/tests/databases/firebird.php
@@ -69,13 +69,13 @@ class FirebirdTest extends UnitTestCase {
 		$this->assertTrue($only_system);
 	}
 
-	function TestCreateDatabase()
+	function TestCreateTable()
 	{
 		//Attempt to create the table
 		$sql = $this->db->manip->create_table('create_test', array('id' => 'SMALLINT'));
 		$this->db->query($sql);
 		
-		//This test fails for an unknown reason, when clearly the database exists
+		//This test fails for an unknown reason, when clearly the table exists
 		//Reset
 		/*$this->tearDown();
 		$this->setUp();
@@ -88,7 +88,7 @@ class FirebirdTest extends UnitTestCase {
 		$this->assertTrue($table_exists);*/
 	}
 
-	function TestDeleteDatabase()
+	function TestDeleteTable()
 	{
 		//Attempt to delete the table
 		$sql = $this->db->manip->delete_table('create_test');
diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB
index dca512f..bf379a6 100755
Binary files a/tests/test_dbs/FB_TEST_DB.FDB and b/tests/test_dbs/FB_TEST_DB.FDB differ
diff --git a/tests/test_dbs/test_sqlite.db b/tests/test_dbs/test_sqlite.db
index 4436395..64b32b8 100755
Binary files a/tests/test_dbs/test_sqlite.db and b/tests/test_dbs/test_sqlite.db differ