diff --git a/databases/firebird.php b/databases/firebird.php
index 7892ebf..e8bcef3 100644
--- a/databases/firebird.php
+++ b/databases/firebird.php
@@ -365,11 +365,11 @@ SQL;
 		$output_sql = '';
 		
 		// Get the data for each object
-		foreach($table as $r)
+		foreach($tables as $t)
 		{
-			$sql = 'SELECT * FROM "'.$r['name'].'"';
+			$sql = 'SELECT * FROM "'.trim($t).'"';
 			$res = $this->query($sql);
-			$obj_res = $res->fetchAll(PDO::FETCH_ASSOC);
+			$obj_res = $this->fetchAll(PDO::FETCH_ASSOC);
 			
 			unset($res);
 			
@@ -389,7 +389,7 @@ SQL;
 					$row[$i] = (is_numeric($row[$i])) ? $row[$i] : $this->quote($row[$i]);
 				}
 				
-				$row_string = 'INSERT INTO "'.$r['name'].'" ("'.implode('","', $columns).'") VALUES ('.implode(',', $row).');';
+				$row_string = 'INSERT INTO "'.trim($t).'" ("'.implode('","', $columns).'") VALUES ('.implode(',', $row).');';
 				
 				unset($row);
 				
diff --git a/tests/databases/firebird.php b/tests/databases/firebird.php
index 16f082c..6d9cb5d 100644
--- a/tests/databases/firebird.php
+++ b/tests/databases/firebird.php
@@ -118,8 +118,6 @@ SQL;
 
 	function TestDeleteTable()
 	{
-		?><pre><?= $this->db->backup_data(); ?></pre><?php
-
 		//Attempt to delete the table
 		$sql = $this->db->manip->delete_table('create_test');
 		$this->db->query($sql);
diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB
index f7adb98..c89a7cc 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 0f55884..92e22a7 100755
Binary files a/tests/test_dbs/test_sqlite.db and b/tests/test_dbs/test_sqlite.db differ