diff --git a/test/classes/PMA_DBQbe_test.php b/test/classes/PMA_DBQbe_test.php
index 5139837180..c96b9752e6 100644
--- a/test/classes/PMA_DBQbe_test.php
+++ b/test/classes/PMA_DBQbe_test.php
@@ -98,14 +98,19 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for getCommonFunctions
      */
-    public function testGetCommonFunctions(){
-        $this->assertTrue($this->object->getCommonFunctions() instanceof PMA_CommonFunctions);
+    public function testGetCommonFunctions()
+    {
+        $this->assertInstanceOf(
+            'PMA_CommonFunctions',
+            $this->object->getCommonFunctions()
+        );
     }
 
     /**
      * Test for _getSortSelectCell
      */
-    public function testGetSortSelectCell(){
+    public function testGetSortSelectCell()
+    {
         $this->assertEquals(
             '<td class="center"><select style="width: 12ex" name="criteriaSort[1]" size="1"><option value="">&nbsp;</option><option value="ASC">Ascending</option><option value="DESC">Descending</option></select></td>',
             $this->_callProtectedFunction(
@@ -118,7 +123,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getSortRow
      */
-    public function testGetSortRow(){
+    public function testGetSortRow()
+    {
         $this->assertEquals(
             '<tr class="even noclick"><th>Sort:</th><td class="center"><select style="width: 12ex" name="criteriaSort[0]" size="1"><option value="">&nbsp;</option><option value="ASC">Ascending</option><option value="DESC">Descending</option></select></td><td class="center"><select style="width: 12ex" name="criteriaSort[1]" size="1"><option value="">&nbsp;</option><option value="ASC">Ascending</option><option value="DESC">Descending</option></select></td><td class="center"><select style="width: 12ex" name="criteriaSort[2]" size="1"><option value="">&nbsp;</option><option value="ASC">Ascending</option><option value="DESC">Descending</option></select></td></tr>',
             $this->_callProtectedFunction(
@@ -131,7 +137,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getShowRow
      */
-    public function testGetShowRow(){
+    public function testGetShowRow()
+    {
         $this->assertEquals(
             '<tr class="odd noclick"><th>Show:</th><td class="center"><input type="checkbox" name="criteriaShow[0]" /></td><td class="center"><input type="checkbox" name="criteriaShow[1]" /></td><td class="center"><input type="checkbox" name="criteriaShow[2]" /></td></tr>',
             $this->_callProtectedFunction(
@@ -144,7 +151,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getCriteriaInputboxRow
      */
-    public function testGetCriteriaInputboxRow(){
+    public function testGetCriteriaInputboxRow()
+    {
         $this->assertEquals(
             '<tr class="even noclick"><th>Criteria:</th><td class="center"><input type="hidden" name="prev_criteria[0]" value="" /><input type="text" name="criteria[0]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="hidden" name="prev_criteria[1]" value="" /><input type="text" name="criteria[1]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="hidden" name="prev_criteria[2]" value="" /><input type="text" name="criteria[2]" value="" class="textfield" style="width: 12ex" size="20" /></td></tr>',
             $this->_callProtectedFunction(
@@ -157,7 +165,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getFootersOptions
      */
-    public function testGetFootersOptions(){
+    public function testGetFootersOptions()
+    {
         $this->assertEquals(
             '<div class="floatleft">Add/Delete criteria rows:<select size="1" name="criteriaRowAdd"><option value="-3">-3</option><option value="-2">-2</option><option value="-1">-1</option><option value="0" selected="selected">0</option><option value="1">1</option><option value="2">2</option><option value="3">3</option></select></div>',
             $this->_callProtectedFunction(
@@ -170,7 +179,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getTableFooters
      */
-    public function testGetTableFooters(){
+    public function testGetTableFooters()
+    {
         $this->assertEquals(
             '<fieldset class="tblFooters"><div class="floatleft">Add/Delete criteria rows:<select size="1" name="criteriaRowAdd"><option value="-3">-3</option><option value="-2">-2</option><option value="-1">-1</option><option value="0" selected="selected">0</option><option value="1">1</option><option value="2">2</option><option value="3">3</option></select></div><div class="floatleft">Add/Delete columns:<select size="1" name="criteriaColumnAdd"><option value="-3">-3</option><option value="-2">-2</option><option value="-1">-1</option><option value="0" selected="selected">0</option><option value="1">1</option><option value="2">2</option><option value="3">3</option></select></div><div class="floatleft"><input type="submit" name="modify"value="Update Query" /></div></fieldset>',
             $this->_callProtectedFunction(
@@ -183,7 +193,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getAndOrColCell
      */
-    public function testGetAndOrColCell(){
+    public function testGetAndOrColCell()
+    {
         $this->assertEquals(
             '<td class="center"><strong>Or:</strong><input type="radio" name="criteriaAndOrColumn[1]" value="or" />&nbsp;&nbsp;<strong>And:</strong><input type="radio" name="criteriaAndOrColumn[1]" value="and" /><br />Ins<input type="checkbox" name="criteriaColumnInsert[1]" />&nbsp;&nbsp;Del<input type="checkbox" name="criteriaColumnDelete[1]" /></td>',
             $this->_callProtectedFunction(
@@ -196,7 +207,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getModifyColumnsRow
      */
-    public function testGetModifyColumnsRow(){
+    public function testGetModifyColumnsRow()
+    {
         $this->assertEquals(
             '<tr class="even noclick"><th>Modify:</th><td class="center"><strong>Or:</strong><input type="radio" name="criteriaAndOrColumn[0]" value="or" />&nbsp;&nbsp;<strong>And:</strong><input type="radio" name="criteriaAndOrColumn[0]" value="and" checked="checked" /><br />Ins<input type="checkbox" name="criteriaColumnInsert[0]" />&nbsp;&nbsp;Del<input type="checkbox" name="criteriaColumnDelete[0]" /></td><td class="center"><strong>Or:</strong><input type="radio" name="criteriaAndOrColumn[1]" value="or" />&nbsp;&nbsp;<strong>And:</strong><input type="radio" name="criteriaAndOrColumn[1]" value="and" checked="checked" /><br />Ins<input type="checkbox" name="criteriaColumnInsert[1]" />&nbsp;&nbsp;Del<input type="checkbox" name="criteriaColumnDelete[1]" /></td><td class="center"><strong>Or:</strong><input type="radio" name="criteriaAndOrColumn[2]" value="or" />&nbsp;&nbsp;<strong>And:</strong><input type="radio" name="criteriaAndOrColumn[2]" value="and" checked="checked" /><br />Ins<input type="checkbox" name="criteriaColumnInsert[2]" />&nbsp;&nbsp;Del<input type="checkbox" name="criteriaColumnDelete[2]" /></td></tr>',
             $this->_callProtectedFunction(
@@ -209,13 +221,14 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getInsDelAndOrCell
      */
-    public function testGetInsDelAndOrCell(){
+    public function testGetInsDelAndOrCell()
+    {
         $GLOBALS['cell_align_right'] = 'cellAlign';
         $this->assertEquals(
-            '<td class="cellAlign nowrap"><!-- Row controls --><table class="nospacing nopadding"><tr><td class="cellAlign nowrap"><small>Ins:</small><input type="checkbox" name="criteriaRowInsert[3]" /></td><td class="cellAlign"><strong>And:</strong></td><td><input type="radio" name="criteriaAndOrRow[3]" value="and"c /></td></tr><tr><td class="cellAlign nowrap"><small>Del:</small><input type="checkbox" name="criteriaRowDelete[3]" /></td><td class="cellAlign"><strong>Or:</strong></td><td><input type="radio" name="criteriaAndOrRow[3]" value="or"c /></td></tr></table></td>',
+            '<td class="cellAlign nowrap"><!-- Row controls --><table class="nospacing nopadding"><tr><td class="cellAlign nowrap"><small>Ins:</small><input type="checkbox" name="criteriaRowInsert[3]" /></td><td class="cellAlign"><strong>And:</strong></td><td><input type="radio" name="criteriaAndOrRow[3]" value="and" /></td></tr><tr><td class="cellAlign nowrap"><small>Del:</small><input type="checkbox" name="criteriaRowDelete[3]" /></td><td class="cellAlign"><strong>Or:</strong></td><td><input type="radio" name="criteriaAndOrRow[3]" value="or" checked="checked" /></td></tr></table></td>',
             $this->_callProtectedFunction(
                 '_getInsDelAndOrCell',
-                array(3, 'checked')
+                array(3, array('and' => '', 'or' => ' checked="checked"'))
             )
         );
     }
@@ -223,7 +236,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getInputboxRow
      */
-    public function testGetInputboxRow(){
+    public function testGetInputboxRow()
+    {
         $this->assertEquals(
             '<td class="center"><input type="text" name="Or2[0]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="text" name="Or2[1]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="text" name="Or2[2]" value="" class="textfield" style="width: 12ex" size="20" /></td>',
             $this->_callProtectedFunction(
@@ -236,7 +250,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getInsDelAndOrCriteriaRows
      */
-    public function testGetInsDelAndOrCriteriaRows(){
+    public function testGetInsDelAndOrCriteriaRows()
+    {
         $this->assertEquals(
             '<tr class="odd noclick"><td class="cellAlign nowrap"><!-- Row controls --><table class="nospacing nopadding"><tr><td class="cellAlign nowrap"><small>Ins:</small><input type="checkbox" name="criteriaRowInsert[0]" /></td><td class="cellAlign"><strong>And:</strong></td><td><input type="radio" name="criteriaAndOrRow[0]" value="and" /></td></tr><tr><td class="cellAlign nowrap"><small>Del:</small><input type="checkbox" name="criteriaRowDelete[0]" /></td><td class="cellAlign"><strong>Or:</strong></td><td><input type="radio" name="criteriaAndOrRow[0]" value="or" checked="checked" /></td></tr></table></td><td class="center"><input type="text" name="Or0[0]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="text" name="Or0[1]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="text" name="Or0[2]" value="" class="textfield" style="width: 12ex" size="20" /></td></tr>',
             $this->_callProtectedFunction(
@@ -249,7 +264,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getSelectClause
      */
-    public function testGetSelectClause(){
+    public function testGetSelectClause()
+    {
         $this->assertEquals(
             '',
             $this->_callProtectedFunction(
@@ -262,7 +278,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getWhereClause
      */
-    public function testGetWhereClause(){
+    public function testGetWhereClause()
+    {
         $this->assertEquals(
             '',
             $this->_callProtectedFunction(
@@ -275,7 +292,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getOrderByClause
      */
-    public function testGetOrderByClause(){
+    public function testGetOrderByClause()
+    {
         $this->assertEquals(
             '',
             $this->_callProtectedFunction(
@@ -288,7 +306,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getIndexes
      */
-    public function testGetIndexes(){
+    public function testGetIndexes()
+    {
         if (! function_exists('PMA_DBI_get_table_indexes')) {
             function PMA_DBI_get_table_indexes()
             {
@@ -314,7 +333,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getLeftJoinColumnCandidates
      */
-    public function test_getLeftJoinColumnCandidates(){
+    public function test_getLeftJoinColumnCandidates()
+    {
         if (! function_exists('PMA_DBI_select_db')) {
             function PMA_DBI_select_db()
             {
@@ -339,7 +359,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getMasterTable
      */
-    public function test_getMasterTable(){
+    public function test_getMasterTable()
+    {
         $this->assertEquals(
             0,
             $this->_callProtectedFunction(
@@ -357,8 +378,14 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getWhereClauseTablesAndColumns
      */
-    public function test_getWhereClauseTablesAndColumns(){
-        $_POST['criteriaColumn'] = array('table1.id', 'table1.value', 'table1.name', 'table1.deleted');
+    public function test_getWhereClauseTablesAndColumns()
+    {
+        $_POST['criteriaColumn'] = array(
+            'table1.id',
+            'table1.value',
+            'table1.name',
+            'table1.deleted'
+        );
         $this->assertEquals(
             array(
                 'where_clause_tables' => array(),
@@ -374,12 +401,13 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getFromClause
      */
-    public function testGetFromClause(){
+    public function testGetFromClause()
+    {
         $this->assertEquals(
-            '`table1`',
+            'table1',
             $this->_callProtectedFunction(
                 '_getFromClause',
-                array('relation')
+                array(array('relwork' => False))
             )
         );
     }
@@ -387,13 +415,14 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getSQLQuery
      */
-    public function test_getSQLQuery(){
+    public function test_getSQLQuery()
+    {
         $this->assertEquals(
-            'FROM `table1`
+            'FROM table1
 ',
             $this->_callProtectedFunction(
                 '_getSQLQuery',
-                array('relation')
+                array(array('relwork' => False))
             )
         );
     }
diff --git a/test/classes/PMA_DbSearch_test.php b/test/classes/PMA_DbSearch_test.php
index 4bcb52bd8e..e55ab196a8 100644
--- a/test/classes/PMA_DbSearch_test.php
+++ b/test/classes/PMA_DbSearch_test.php
@@ -41,7 +41,10 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase
                 );
             }
         }
-        $this->object = $this->getMockForAbstractClass('PMA_DbSearch', array('pma'));
+        $this->object = $this->getMockForAbstractClass(
+            'PMA_DbSearch',
+            array('pma')
+        );
     }
 
     /**
@@ -75,14 +78,19 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase
     /**
      * Test for getCommonFunctions
      */
-    public function testGetCommonFunctions(){
-        $this->assertTrue($this->object->getCommonFunctions() instanceof PMA_CommonFunctions);
+    public function testGetCommonFunctions()
+    {
+        $this->assertInstanceOf(
+            'PMA_CommonFunctions',
+            $this->object->getCommonFunctions()
+        );
     }
 
     /**
      * Test for _getSearchSqls
      */
-    public function testGetSearchSqls(){
+    public function testGetSearchSqls()
+    {
 
         $GLOBALS['db'] = 'pma';
         if (! function_exists('PMA_DBI_get_columns')) {
@@ -111,7 +119,8 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase
     /**
      * Test for getSearchResults
      */
-    public function testGetSearchResults(){
+    public function testGetSearchResults()
+    {
         $this->assertEquals(
             '<br /><table class="data"><caption class="tblHeaders">Search results for "<i></i>" :</caption></table>',
             $this->object->getSearchResults()
@@ -127,7 +136,9 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase
      *
      * @dataProvider providerForTestGetResultsRow
      */
-    public function testGetResultsRow($each_table, $newsearchsqls, $odd_row, $output){
+    public function testGetResultsRow(
+        $each_table, $newsearchsqls, $odd_row, $output
+    ){
 
         if (! function_exists('PMA_DBI_fetch_value')) {
             function PMA_DBI_fetch_value()
@@ -148,7 +159,8 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase
     /**
      * @return array provider for testGetResultsRow
      */
-    public function providerForTestGetResultsRow(){
+    public function providerForTestGetResultsRow()
+    {
         return array(
             array(
                 'table1',
@@ -168,7 +180,8 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase
     /**
      * Test for getSelectionForm
      */
-    public function testGetSelectionForm(){
+    public function testGetSelectionForm()
+    {
         $_SESSION[' PMA_token '] = 'token';
         $_SESSION['PMA_Theme'] = new PMA_Theme();
         $GLOBALS['pmaThemeImage'] = 'themes/dot.gif';
@@ -190,7 +203,8 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase
     /**
      * Test for _getResultDivs
      */
-    public function testGetResultDivs(){
+    public function testGetResultDivs()
+    {
         $this->assertEquals(
             '<!-- These two table-image and table-link elements display the table name in browse search results  --><div id="table-info"><a class="item" id="table-link" ></a></div><div id="browse-results"><!-- this browse-results div is used to load the browse and delete results in the db search --></div><br class="clearfloat" /><div id="sqlqueryform"><!-- this sqlqueryform div is used to load the delete form in the db search --></div><!--  toggle query box link--><a id="togglequerybox"></a>',
             $this->_callProtectedFunction(
diff --git a/test/classes/PMA_Theme_Manager_test.php b/test/classes/PMA_Theme_Manager_test.php
index 7e20d743cd..833ce22efa 100644
--- a/test/classes/PMA_Theme_Manager_test.php
+++ b/test/classes/PMA_Theme_Manager_test.php
@@ -48,7 +48,10 @@ class PMA_Theme_Manager_test extends PHPUnit_Framework_TestCase
     public function testHtmlSelectBox()
     {
         $tm = new PMA_Theme_Manager();
-        $this->assertContains('<option value="pmahomme" selected="selected">', $tm->getHtmlSelectBox());
+        $this->assertContains(
+            '<option value="pmahomme" selected="selected">',
+            $tm->getHtmlSelectBox()
+        );
     }
 
     /**
@@ -101,7 +104,10 @@ class PMA_Theme_Manager_test extends PHPUnit_Framework_TestCase
      */
     public function testGetFallBackTheme(){
         $tm = new PMA_Theme_Manager();
-        $this->assertTrue($tm->getFallBackTheme() instanceof PMA_Theme);
+        $this->assertInstanceOf(
+            'PMA_theme',
+            $tm->getFallBackTheme()
+        );
     }
 
 }
diff --git a/test/classes/gis/PMA_GIS_Geometrycollection_test.php b/test/classes/gis/PMA_GIS_Geometrycollection_test.php
index 0ea797bdeb..7b7e640fc9 100644
--- a/test/classes/gis/PMA_GIS_Geometrycollection_test.php
+++ b/test/classes/gis/PMA_GIS_Geometrycollection_test.php
@@ -236,7 +236,7 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase
         $return = $this->object->prepareRowAsPdf(
             $spatial, $label, $line_color, $scale_data, $pdf
         );
-        $this->assertTrue($return instanceof TCPDF);
+        $this->assertInstanceOf('TCPDF', $return);
     }
 
     public function providerForPrepareRowAsPdf()
diff --git a/test/classes/gis/PMA_GIS_Linestring_test.php b/test/classes/gis/PMA_GIS_Linestring_test.php
index 6a12feaa85..44e3dc80cb 100644
--- a/test/classes/gis/PMA_GIS_Linestring_test.php
+++ b/test/classes/gis/PMA_GIS_Linestring_test.php
@@ -181,6 +181,7 @@ class PMA_GIS_LinestringTest extends PMA_GIS_GeomTest
         $return = $this->object->prepareRowAsPng(
             $spatial, $label, $line_color, $scale_data, $image
         );
+        /* TODO: this never fails */
         $this->assertTrue(true);
     }
 
@@ -220,7 +221,7 @@ class PMA_GIS_LinestringTest extends PMA_GIS_GeomTest
         $return = $this->object->prepareRowAsPdf(
             $spatial, $label, $line_color, $scale_data, $pdf
         );
-        $this->assertTrue($return instanceof TCPDF);
+        $this->assertInstanceOf('TCPDF', $return);
     }
 
     public function providerForPrepareRowAsPdf()
diff --git a/test/classes/gis/PMA_GIS_Multilinestring_test.php b/test/classes/gis/PMA_GIS_Multilinestring_test.php
index 7547d634ea..61027cdff6 100644
--- a/test/classes/gis/PMA_GIS_Multilinestring_test.php
+++ b/test/classes/gis/PMA_GIS_Multilinestring_test.php
@@ -235,10 +235,14 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsPng
      */
-    public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output)
-    {
+    public function testPrepareRowAsPng(
+        $spatial, $label, $line_color, $scale_data, $image, $output
+    ) {
 
-        $return = $this->object->prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image);
+        $return = $this->object->prepareRowAsPng(
+            $spatial, $label, $line_color, $scale_data, $image
+        );
+        /* TODO: this never fails */
         $this->assertTrue(true);
     }
 
@@ -272,11 +276,14 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsPdf
      */
-    public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf)
-    {
+    public function testPrepareRowAsPdf(
+        $spatial, $label, $line_color, $scale_data, $pdf
+    ) {
 
-        $return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf);
-        $this->assertTrue($return instanceof TCPDF);
+        $return = $this->object->prepareRowAsPdf(
+            $spatial, $label, $line_color, $scale_data, $pdf
+        );
+        $this->assertInstanceOf('TCPDF', $return);
     }
 
     public function providerForPrepareRowAsPdf(){
@@ -307,12 +314,14 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsSvg
      */
-    public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output)
-    {
+    public function testPrepareRowAsSvg(
+        $spatial, $label, $line_color, $scale_data, $output
+    ) {
 
-        $string = $this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data);
+        $string = $this->object->prepareRowAsSvg(
+            $spatial, $label, $line_color, $scale_data
+        );
         $this->assertEquals(1, preg_match($output, $string));
-        //$this->assertEquals($this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data) , $output);
     }
 
     public function providerForPrepareRowAsSvg(){
@@ -344,10 +353,16 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsOl
      */
-    public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output)
-    {
+    public function testPrepareRowAsOl(
+        $spatial, $srid, $label, $line_color, $scale_data, $output
+    ) {
 
-        $this->assertEquals($this->object->prepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data), $output);
+        $this->assertEquals(
+            $output,
+            $this->object->prepareRowAsOl(
+                $spatial, $srid, $label, $line_color, $scale_data
+            )
+        );
     }
 
     public function providerForPrepareRowAsOl(){
diff --git a/test/classes/gis/PMA_GIS_Multipoint_test.php b/test/classes/gis/PMA_GIS_Multipoint_test.php
index eaff4559e2..6957dec9b7 100644
--- a/test/classes/gis/PMA_GIS_Multipoint_test.php
+++ b/test/classes/gis/PMA_GIS_Multipoint_test.php
@@ -179,10 +179,14 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsPng
      */
-    public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output)
-    {
+    public function testPrepareRowAsPng(
+        $spatial, $label, $line_color, $scale_data, $image, $output
+    ) {
 
-        $return = $this->object->prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image);
+        $return = $this->object->prepareRowAsPng(
+            $spatial, $label, $line_color, $scale_data, $image
+        );
+        /* TODO: this never fails */
         $this->assertTrue(true);
     }
 
@@ -216,11 +220,14 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsPdf
      */
-    public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf)
-    {
+    public function testPrepareRowAsPdf(
+        $spatial, $label, $line_color, $scale_data, $pdf
+    ) {
 
-        $return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf);
-        $this->assertTrue($return instanceof TCPDF);
+        $return = $this->object->prepareRowAsPdf(
+            $spatial, $label, $line_color, $scale_data, $pdf
+        );
+        $this->assertInstanceOf('TCPDF', $return);
     }
 
     public function providerForPrepareRowAsPdf(){
@@ -251,12 +258,14 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsSvg
      */
-    public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output)
-    {
+    public function testPrepareRowAsSvg(
+        $spatial, $label, $line_color, $scale_data, $output
+    ) {
 
-        $string = $this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data);
+        $string = $this->object->prepareRowAsSvg(
+            $spatial, $label, $line_color, $scale_data
+        );
         $this->assertEquals(1, preg_match($output, $string));
-//        $this->assertEquals($this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data) , $output);
     }
 
     public function providerForPrepareRowAsSvg(){
@@ -288,10 +297,16 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsOl
      */
-    public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output)
-    {
+    public function testPrepareRowAsOl(
+        $spatial, $srid, $label, $line_color, $scale_data, $output
+    ) {
 
-        $this->assertEquals($this->object->prepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data), $output);
+        $this->assertEquals(
+            $output,
+            $this->object->prepareRowAsOl(
+                $spatial, $srid, $label, $line_color, $scale_data
+            )
+        );
     }
 
     public function providerForPrepareRowAsOl(){
diff --git a/test/classes/gis/PMA_GIS_Multipolygon_test.php b/test/classes/gis/PMA_GIS_Multipolygon_test.php
index c62959a43e..b52ed9ba8e 100644
--- a/test/classes/gis/PMA_GIS_Multipolygon_test.php
+++ b/test/classes/gis/PMA_GIS_Multipolygon_test.php
@@ -273,10 +273,14 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsPng
      */
-    public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output)
-    {
+    public function testPrepareRowAsPng(
+        $spatial, $label, $line_color, $scale_data, $image, $output
+    ) {
 
-        $return = $this->object->prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image);
+        $return = $this->object->prepareRowAsPng(
+            $spatial, $label, $line_color, $scale_data, $image
+        );
+        /* TODO: this never fails */
         $this->assertTrue(true);
     }
 
@@ -310,11 +314,14 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsPdf
      */
-    public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf)
-    {
+    public function testPrepareRowAsPdf(
+        $spatial, $label, $line_color, $scale_data, $pdf
+    ) {
 
-        $return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf);
-        $this->assertTrue($return instanceof TCPDF);
+        $return = $this->object->prepareRowAsPdf(
+            $spatial, $label, $line_color, $scale_data, $pdf
+        );
+        $this->assertInstanceOf('TCPDF', $return);
     }
 
     public function providerForPrepareRowAsPdf(){
@@ -345,12 +352,14 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsSvg
      */
-    public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output)
-    {
+    public function testPrepareRowAsSvg(
+        $spatial, $label, $line_color, $scale_data, $output
+    ) {
 
-        $string = $this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data);
+        $string = $this->object->prepareRowAsSvg(
+            $spatial, $label, $line_color, $scale_data
+        );
         $this->assertEquals(1, preg_match($output, $string));
-//        $this->assertEquals($this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data) , $output);
     }
 
     public function providerForPrepareRowAsSvg(){
@@ -382,10 +391,16 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsOl
      */
-    public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output)
-    {
+    public function testPrepareRowAsOl(
+        $spatial, $srid, $label, $line_color, $scale_data, $output
+    ) {
 
-        $this->assertEquals($this->object->prepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data), $output);
+        $this->assertEquals(
+            $output,
+            $this->object->prepareRowAsOl(
+                $spatial, $srid, $label, $line_color, $scale_data
+            )
+        );
     }
 
     public function providerForPrepareRowAsOl(){
diff --git a/test/classes/gis/PMA_GIS_Point_test.php b/test/classes/gis/PMA_GIS_Point_test.php
index 35908d7f35..c860818074 100644
--- a/test/classes/gis/PMA_GIS_Point_test.php
+++ b/test/classes/gis/PMA_GIS_Point_test.php
@@ -181,10 +181,14 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsPng
      */
-    public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output)
-    {
+    public function testPrepareRowAsPng(
+        $spatial, $label, $line_color, $scale_data, $image, $output
+    ) {
 
-        $return = $this->object->prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image);
+        $return = $this->object->prepareRowAsPng(
+            $spatial, $label, $line_color, $scale_data, $image
+        );
+        /* TODO: this never fails */
         $this->assertTrue(true);
     }
 
@@ -218,11 +222,14 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsPdf
      */
-    public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf)
-    {
+    public function testPrepareRowAsPdf(
+        $spatial, $label, $line_color, $scale_data, $pdf
+    ) {
 
-        $return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf);
-        $this->assertTrue($return instanceof TCPDF);
+        $return = $this->object->prepareRowAsPdf(
+            $spatial, $label, $line_color, $scale_data, $pdf
+        );
+        $this->assertInstanceOf('TCPDF', $return);
     }
 
     public function providerForPrepareRowAsPdf(){
@@ -253,11 +260,16 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsSvg
      */
-    public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output)
-    {
+    public function testPrepareRowAsSvg(
+        $spatial, $label, $line_color, $scale_data, $output
+    ) {
 
-        $this->assertEquals($output, $this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data));
-//        $this->assertEquals($this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data) , $output);
+        $this->assertEquals(
+            $output,
+            $this->object->prepareRowAsSvg(
+                $spatial, $label, $line_color, $scale_data
+            )
+        );
     }
 
     public function providerForPrepareRowAsSvg(){
@@ -289,10 +301,16 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsOl
      */
-    public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output)
-    {
+    public function testPrepareRowAsOl(
+        $spatial, $srid, $label, $line_color, $scale_data, $output
+    ) {
 
-        $this->assertEquals($this->object->prepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data), $output);
+        $this->assertEquals(
+            $output,
+            $this->object->prepareRowAsOl(
+                $spatial, $srid, $label, $line_color, $scale_data
+            )
+        );
     }
 
     public function providerForPrepareRowAsOl(){
diff --git a/test/classes/gis/PMA_GIS_Polygon_test.php b/test/classes/gis/PMA_GIS_Polygon_test.php
index 1b852c8d71..2981aa3b69 100644
--- a/test/classes/gis/PMA_GIS_Polygon_test.php
+++ b/test/classes/gis/PMA_GIS_Polygon_test.php
@@ -361,10 +361,14 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsPng
      */
-    public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output)
-    {
+    public function testPrepareRowAsPng(
+        $spatial, $label, $line_color, $scale_data, $image, $output
+    ) {
 
-        $return = $this->object->prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image);
+        $return = $this->object->prepareRowAsPng(
+            $spatial, $label, $line_color, $scale_data, $image
+        );
+        /* TODO: this never fails */
         $this->assertTrue(true);
     }
 
@@ -398,11 +402,14 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsPdf
      */
-    public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf)
-    {
+    public function testPrepareRowAsPdf(
+        $spatial, $label, $line_color, $scale_data, $pdf
+    ) {
 
-        $return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf);
-        $this->assertTrue($return instanceof TCPDF);
+        $return = $this->object->prepareRowAsPdf(
+            $spatial, $label, $line_color, $scale_data, $pdf
+        );
+        $this->assertInstanceOf('TCPDF', $return);
     }
 
     public function providerForPrepareRowAsPdf(){
@@ -433,12 +440,14 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsSvg
      */
-    public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output)
-    {
+    public function testPrepareRowAsSvg(
+        $spatial, $label, $line_color, $scale_data, $output
+    ) {
 
-        $string = $this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data);
+        $string = $this->object->prepareRowAsSvg(
+            $spatial, $label, $line_color, $scale_data
+        );
         $this->assertEquals(1, preg_match($output, $string));
-//        $this->assertEquals($this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data) , $output);
     }
 
     public function providerForPrepareRowAsSvg(){
@@ -470,10 +479,16 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
      *
      *@dataProvider providerForPrepareRowAsOl
      */
-    public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output)
-    {
+    public function testPrepareRowAsOl(
+        $spatial, $srid, $label, $line_color, $scale_data, $output
+    ) {
 
-        $this->assertEquals($this->object->prepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data), $output);
+        $this->assertEquals(
+            $output,
+            $this->object->prepareRowAsOl(
+                $spatial, $srid, $label, $line_color, $scale_data
+            )
+        );
     }
 
     public function providerForPrepareRowAsOl(){