diff --git a/server_status.php b/server_status.php
index 328ff05bfa..46b039f9d5 100644
--- a/server_status.php
+++ b/server_status.php
@@ -46,7 +46,7 @@ if (! empty($_REQUEST['kill'])) {
 $response = PMA_Response::getInstance();
 $response->addHTML('<div>');
 $response->addHTML($ServerStatusData->getMenuHtml());
-$response->addHTML(getServerTrafficHtml($ServerStatusData));
+$response->addHTML(PMA_getServerTrafficHtml($ServerStatusData));
 $response->addHTML('</div>');
 
 exit;
@@ -58,19 +58,19 @@ exit;
  *
  * @return string
  */
-function getServerTrafficHtml($ServerStatusData)
+function PMA_getServerTrafficHtml($ServerStatusData)
 {
     //display the server state General Information
-    $retval  = getServerStateGeneralInfoHtml($ServerStatusData);
+    $retval  = PMA_getServerStateGeneralInfoHtml($ServerStatusData);
 
     //display the server state traffic
-    $retval .= getServerStateTrafficHtml($ServerStatusData);
+    $retval .= PMA_getServerStateTrafficHtml($ServerStatusData);
 
     //display the server state connection information
-    $retval .= getServerStateConnectionsHtml($ServerStatusData);
+    $retval .= PMA_getServerStateConnectionsHtml($ServerStatusData);
 
     //display the Table Process List information
-    $retval .= getTableProcesslistHtml($ServerStatusData);
+    $retval .= PMA_getTableProcesslistHtml($ServerStatusData);
 
     return $retval;
 }
@@ -82,7 +82,7 @@ function getServerTrafficHtml($ServerStatusData)
  *
  * @return string
  */
-function getServerStateGeneralInfoHtml($ServerStatusData)
+function PMA_getServerStateGeneralInfoHtml($ServerStatusData)
 { 
     $start_time = PMA_DBI_fetchValue(
         'SELECT UNIX_TIMESTAMP() - ' . $ServerStatusData->status['Uptime']
@@ -161,7 +161,7 @@ function getServerStateGeneralInfoHtml($ServerStatusData)
  *
  * @return string
  */
-function getServerStateTrafficHtml($ServerStatusData)
+function PMA_getServerStateTrafficHtml($ServerStatusData)
 {   
     $hour_factor    = 3600 / $ServerStatusData->status['Uptime'];
     $retval  = '<table id="serverstatustraffic" class="data noclick">';
@@ -250,7 +250,7 @@ function getServerStateTrafficHtml($ServerStatusData)
  *
  * @return string
  */
-function getServerStateConnectionsHtml($ServerStatusData)
+function PMA_getServerStateConnectionsHtml($ServerStatusData)
 {
     $hour_factor    = 3600 / $ServerStatusData->status['Uptime'];
     $retval  = '<table id="serverstatusconnections" class="data noclick">';
@@ -349,7 +349,7 @@ function getServerStateConnectionsHtml($ServerStatusData)
  *
  * @return string
  */
-function getTableProcesslistHtml($ServerStatusData)
+function PMA_getTableProcesslistHtml($ServerStatusData)
 {
     $url_params = array();
 
diff --git a/server_status_queries.php b/server_status_queries.php
index 3df0725b76..4bacf65ce4 100644
--- a/server_status_queries.php
+++ b/server_status_queries.php
@@ -42,7 +42,7 @@ $scripts->addFile('server_status_sorter.js');
 // Add the html content to the response
 $response->addHTML('<div>');
 $response->addHTML($ServerStatusData->getMenuHtml());
-$response->addHTML(getQueryStatisticsHtml($ServerStatusData));
+$response->addHTML(PMA_getQueryStatisticsHtml($ServerStatusData));
 $response->addHTML('</div>');
 exit;
 
@@ -53,7 +53,7 @@ exit;
  *
  * @return string
  */
-function getQueryStatisticsHtml($ServerStatusData)
+function PMA_getQueryStatisticsHtml($ServerStatusData)
 {
     $retval = '';
 
@@ -89,7 +89,7 @@ function getQueryStatisticsHtml($ServerStatusData)
     $retval .= '</span>';
     $retval .= '</h3>';
 
-    $retval .= getServerStatusQueriesDetailsHtml($ServerStatusData);
+    $retval .= PMA_getServerStatusQueriesDetailsHtml($ServerStatusData);
 
     return $retval;
 }
@@ -101,7 +101,7 @@ function getQueryStatisticsHtml($ServerStatusData)
  *
  * @return string
  */
-function getServerStatusQueriesDetailsHtml($ServerStatusData)
+function PMA_getServerStatusQueriesDetailsHtml($ServerStatusData)
 {
     $used_queries = $ServerStatusData->used_queries;
     $total_queries = array_sum($used_queries);
diff --git a/server_status_variables.php b/server_status_variables.php
index bed412f1df..5135acfe2d 100644
--- a/server_status_variables.php
+++ b/server_status_variables.php
@@ -44,9 +44,9 @@ $scripts->addFile('server_status_sorter.js');
 
 $response->addHTML('<div>');
 $response->addHTML($ServerStatusData->getMenuHtml());
-$response->addHTML(getFilterHtml($ServerStatusData));
-$response->addHTML(getLinkSuggestionsHtml($ServerStatusData));
-$response->addHTML(getVariablesTableHtml($ServerStatusData));
+$response->addHTML(PMA_getFilterHtml($ServerStatusData));
+$response->addHTML(PMA_getLinkSuggestionsHtml($ServerStatusData));
+$response->addHTML(PMA_getVariablesTableHtml($ServerStatusData));
 $response->addHTML('</div>');
 
 exit;
@@ -58,7 +58,7 @@ exit;
  *
  * @return string
  */
-function getFilterHtml($ServerStatusData)
+function PMA_getFilterHtml($ServerStatusData)
 {
     $filterAlert = '';
     if (! empty($_REQUEST['filterAlert'])) {
@@ -127,7 +127,7 @@ function getFilterHtml($ServerStatusData)
  *
  * @return string
  */
-function getLinkSuggestionsHtml($ServerStatusData)
+function PMA_getLinkSuggestionsHtml($ServerStatusData)
 {
     $retval  = '<div id="linkSuggestions" class="defaultLinks" style="display:none">';
     $retval .= '<p class="notice">' . __('Related links:');
@@ -161,10 +161,10 @@ function getLinkSuggestionsHtml($ServerStatusData)
  *
  * @return string
  */
-function getVariablesTableHtml($ServerStatusData)
+function PMA_getVariablesTableHtml($ServerStatusData)
 {
     $retval  = '';
-    $strShowStatus = getStatusVariablesDescriptions();
+    $strShowStatus = PMA_getStatusVariablesDescriptions();
     /**
      * define some alerts
      */
@@ -320,7 +320,7 @@ function getVariablesTableHtml($ServerStatusData)
  *
  * @return array
  */
-function getStatusVariablesDescriptions()
+function PMA_getStatusVariablesDescriptions()
 {
     /**
      * Messages are built using the message name
diff --git a/server_variables.php b/server_variables.php
index 7fcbbfb673..136f358d8e 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -98,7 +98,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
                 );
                 $response->addJSON(
                     'variable',
-                    formatVariable($_REQUEST['varName'], $varValue[1])
+                    PMA_formatVariable($_REQUEST['varName'], $varValue[1])
                 );
             } else {
                 $response->isSuccess(false);
@@ -198,7 +198,7 @@ foreach ($serverVars as $name => $value) {
     }
     $output .= '</div>'
         . '<div class="var-value value' . (PMA_isSuperuser() ? ' editable' : '') . '">&nbsp;'
-        . formatVariable($name, $value)
+        . PMA_formatVariable($name, $value)
         . '</div>'
         . '<div style="clear:both"></div>'
         . '</div>';
@@ -207,7 +207,7 @@ foreach ($serverVars as $name => $value) {
         $output .= '<div class="var-row' . ($odd_row ? ' odd' : ' even') . '">'
             . '<div class="var-name session">(' . __('Session value') . ')</div>'
             . '<div class="var-value value">&nbsp;' 
-            . formatVariable($name, $serverVarsSession[$name]) . '</div>'
+            . PMA_formatVariable($name, $serverVarsSession[$name]) . '</div>'
             . '<div style="clear:both"></div>'
             . '</div>';
     }
@@ -226,7 +226,7 @@ $response->addHtml($output);
  *
  * @return formatted string
  */
-function formatVariable($name, $value)
+function PMA_formatVariable($name, $value)
 {
     global $VARIABLE_DOC_LINKS;
 
diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php
index b6d44a7069..808d3a3aa6 100644
--- a/test/classes/PMA_Config_test.php
+++ b/test/classes/PMA_Config_test.php
@@ -62,7 +62,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
     }
 
     public function testGetFontsizeForm()
-    {  
+    {
         $this->assertContains(
             '<form name="form_fontsize_selection" id="form_fontsize_selection"',
             PMA_Config::getFontsizeForm()
@@ -72,6 +72,51 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
             '<label for="select_fontsize">',
             PMA_Config::getFontsizeForm()
         );
+
+        //test getFontsizeOptions for "em" unit
+        $_COOKIE['pma_fontsize'] = "10em";
+        $this->assertContains(
+            '<option value="7em"',
+            PMA_Config::getFontsizeForm()
+        );
+        $this->assertContains(
+            '<option value="8em"',
+            PMA_Config::getFontsizeForm()
+        );
+
+        //test getFontsizeOptions for "pt" unit
+        $_COOKIE['pma_fontsize'] = "10pt";
+        $this->assertContains(
+            '<option value="2pt"',
+            PMA_Config::getFontsizeForm()
+        );
+        $this->assertContains(
+            '<option value="4pt"',
+            PMA_Config::getFontsizeForm()
+        );
+ 
+        //test getFontsizeOptions for "px" unit
+        $_COOKIE['pma_fontsize'] = "10px";
+        $this->assertContains(
+            '<option value="5px"',
+            PMA_Config::getFontsizeForm()
+        );
+        $this->assertContains(
+            '<option value="6px"',
+            PMA_Config::getFontsizeForm()
+        );
+
+        //test getFontsizeOptions for unknown unit
+        $_COOKIE['pma_fontsize'] = "10abc";
+        $this->assertContains(
+            '<option value="7abc"',
+            PMA_Config::getFontsizeForm()
+        );
+        $this->assertContains(
+            '<option value="8abc"',
+            PMA_Config::getFontsizeForm()
+        );    
+        unset($_COOKIE['pma_fontsize']);
     }
 
     public function testCheckOutputCompression()
diff --git a/test/classes/PMA_Util_test.php b/test/classes/PMA_Util_test.php
new file mode 100644
index 0000000000..52f7893fe0
--- /dev/null
+++ b/test/classes/PMA_Util_test.php
@@ -0,0 +1,100 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Test for PMA_Util class
+ *
+ * @package PhpMyAdmin-test
+ */
+
+/*
+ * Include to test.
+ */
+require_once 'libraries/Util.class.php';
+
+/**
+ * Test for PMA_Util class
+ *
+ * @package PhpMyAdmin-test
+ */
+class PMA_Util_Test extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Test for analyze Limit Clause
+     *
+     * @return void
+     */
+    public function testAnalyzeLimitClause()
+    {
+        $limit_data = PMA_Util::analyzeLimitClause("limit 2,4");
+        $this->assertEquals(
+            '2',
+            $limit_data['start']
+        );
+        $this->assertEquals(
+            '4',
+            $limit_data['length']
+        );
+
+        $limit_data = PMA_Util::analyzeLimitClause("limit 3");
+        $this->assertEquals(
+            '0',
+            $limit_data['start']
+        );
+        $this->assertEquals(
+            '3',
+            $limit_data['length']
+        );
+    }
+
+    /**
+     * Test for createGISData
+     *
+     * @return void
+     */
+    public function testCreateGISData()
+    {
+        $this->assertEquals(
+            "abc",
+            PMA_Util::createGISData("abc")
+        );
+        $this->assertEquals(
+            "GeomFromText('POINT()',10)",
+            PMA_Util::createGISData("'POINT()',10")
+        );
+    }
+
+    /**
+     * Test for getGISFunctions
+     *
+     * @return void
+     */
+    public function testGetGISFunctions()
+    {
+        $funcs = PMA_Util::getGISFunctions();
+        $this->assertArrayHasKey(
+            'Dimension',
+            $funcs
+        );
+        $this->assertArrayHasKey(
+            'GeometryType',
+            $funcs
+        );
+        $this->assertArrayHasKey(
+            'MBRDisjoint',
+            $funcs
+        );
+    }
+
+    /**
+     * Test for Page Selector
+     *
+     * @return void
+     */
+    public function testPageSelector()
+    {
+        $this->assertContains(
+            '<select class="pageselector  ajax" name="pma" >',
+            PMA_Util::pageselector("pma",3)
+        );
+    }
+}