diff --git a/ChangeLog b/ChangeLog
index d93d1dcff9..69066c417f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,7 @@ phpMyAdmin - ChangeLog
 - bug #3985 Call to undefined function mb_detect_encoding
 - bug #4007 Analyze option not shown for InnoDB tables
 - bug #4015 Forcing a storage engine for configuration storage
+- bug Incorrect Drizzle 7 detection
 
 4.0.4.1 (2013-06-30)
 - [security] Global variables scope injection vulnerability (see PMASA-2013-7)
diff --git a/libraries/plugins/auth/AuthenticationConfig.class.php b/libraries/plugins/auth/AuthenticationConfig.class.php
index b33ebe570a..5e33a07f1a 100644
--- a/libraries/plugins/auth/AuthenticationConfig.class.php
+++ b/libraries/plugins/auth/AuthenticationConfig.class.php
@@ -153,7 +153,9 @@ class AuthenticationConfig extends AuthenticationPlugin
             echo '</tr>' . "\n";
         }
         echo '</table>' . "\n";
-        exit;
+        if (!defined('TESTSUITE')) {
+            exit;
+        }
         return true;
     }
 
diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php
index b1a0c08bb8..2b68f358ab 100644
--- a/libraries/plugins/auth/AuthenticationCookie.class.php
+++ b/libraries/plugins/auth/AuthenticationCookie.class.php
@@ -102,7 +102,11 @@ class AuthenticationCookie extends AuthenticationPlugin
                     )
                 );
             }
-            exit;
+            if (defined('TESTSUITE')) {
+                return true;
+            } else {
+                exit;
+            }
         }
 
         /* Perform logout to custom URL */
@@ -110,7 +114,11 @@ class AuthenticationCookie extends AuthenticationPlugin
             && ! empty($GLOBALS['cfg']['Server']['LogoutURL'])
         ) {
             PMA_sendHeaderLocation($GLOBALS['cfg']['Server']['LogoutURL']);
-            exit;
+            if (defined('TESTSUITE')) {
+                return true;
+            } else {
+                exit;
+            }
         }
 
         // No recall if blowfish secret is not configured as it would produce
@@ -301,7 +309,11 @@ class AuthenticationCookie extends AuthenticationPlugin
         if (file_exists(CUSTOM_FOOTER_FILE)) {
             include CUSTOM_FOOTER_FILE;
         }
-        exit;
+        if (! defined('TESTSUITE')) {
+            exit;
+        } else {
+            return true;
+        }
     }
 
     /**
@@ -408,7 +420,9 @@ class AuthenticationCookie extends AuthenticationPlugin
             // according to the PHP manual we should do this before the destroy:
             //$_SESSION = array();
 
-            session_destroy();
+            if (! defined('TESTSUITE')) {
+                session_destroy();
+            }
             // -> delete password cookie(s)
             if ($GLOBALS['cfg']['LoginCookieDeleteAll']) {
                 foreach ($GLOBALS['cfg']['Servers'] as $key => $val) {
@@ -478,7 +492,11 @@ class AuthenticationCookie extends AuthenticationPlugin
             PMA_Util::cacheUnset('dbs_where_create_table_allowed', true);
             $GLOBALS['no_activity'] = true;
             $this->authFails();
-            exit;
+            if (! defined('TESTSUITE')) {
+                exit;
+            } else {
+                return false;
+            }
         }
 
         // password
@@ -625,7 +643,11 @@ class AuthenticationCookie extends AuthenticationPlugin
                 $redirect_url . PMA_generate_common_url($url_params, '&'),
                 true
             );
-            exit;
+            if (! defined('TESTSUITE')) {
+                exit;
+            } else {
+                return false;
+            }
         } // end if
 
         return true;
diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php
index 0edf05e329..95cca261bd 100644
--- a/test/bootstrap-dist.php
+++ b/test/bootstrap-dist.php
@@ -71,4 +71,31 @@ if (PMA_HAS_RUNKIT && $GLOBALS['runkit_internal_override']) {
     echo "Please install runkit and enable runkit.internal_override!\n";
 }
 
+/**
+ * Return the tag array to be used with assertTag by parsing
+ * a given HTML element
+ *
+ * @param string $elementHTML HTML for element to be parsed
+ * @param array  $arr         Additional array elements like content, parent
+ *
+ * @return array              Tag array to be used with assertTag
+ */
+function PMA_getTagArray($elementHTML, $arr = array())
+{
+
+    // get attributes
+    preg_match_all("/\s+(.*?)\=\s*\"(.*?)\"/is", $elementHTML, $matches);
+    foreach ($matches[1] as $key => $val) {
+        $arr['attributes'][trim($val)] = trim($matches[2][$key]);
+    }
+    $matches = array();
+
+    // get tag
+    preg_match("/^\<(.*?)(\s|\>)/i", $elementHTML, $matches);
+    if (isset($matches[1])) {
+        $arr['tag'] = trim($matches[1]);
+    }
+
+    return $arr;
+}
 ?>
diff --git a/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php b/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
new file mode 100644
index 0000000000..fe40806f77
--- /dev/null
+++ b/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
@@ -0,0 +1,143 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for AuthenticationConfig class
+ *
+ * @package PhpMyAdmin-test
+ */
+
+require_once 'libraries/plugins/auth/AuthenticationConfig.class.php';
+require_once 'libraries/Util.class.php';
+require_once 'libraries/Theme.class.php';
+require_once 'libraries/Config.class.php';
+require_once 'libraries/php-gettext/gettext.inc';
+require_once 'libraries/config.default.php';
+require_once 'libraries/Error_Handler.class.php';
+/**
+ * tests for AuthenticationConfig class
+ *
+ * @package PhpMyAdmin-test
+ */
+class PMA_AuthenticationConfig_Test extends PHPUnit_Framework_TestCase
+{
+    protected $object;
+
+    /**
+     * Configures global environment.
+     *
+     * @return void
+     */
+    function setup()
+    {
+        $GLOBALS['PMA_Config'] = new PMA_Config();
+        $GLOBALS['PMA_Config']->enableBc();
+        $GLOBALS['server'] = 0;
+        $this->object = new AuthenticationConfig(null);
+    }
+
+    /**
+     * tearDown for test cases
+     * 
+     * @return void
+     */
+    public function tearDown()
+    {
+        unset($this->object);
+    }
+
+    /**
+     * Test for AuthenticationConfig::auth
+     * 
+     * @return void
+     */
+    public function testAuth()
+    {
+        $this->assertTrue(
+            $this->object->auth()
+        );
+    }
+
+    /**
+     * Test for AuthenticationConfig::authCheck
+     * 
+     * @return void
+     */
+    public function testAuthCheck()
+    {
+        $this->assertTrue(
+            $this->object->authCheck()
+        );
+    }
+
+    /**
+     * Test for AuthenticationConfig::authSetUser
+     * 
+     * @return void
+     */
+    public function testAuthSetUser()
+    {
+        $this->assertTrue(
+            $this->object->authSetUser()
+        );
+    }
+
+    /**
+     * Test for AuthenticationConfig::authFails
+     * 
+     * @return void
+     */
+    public function testAuthFails()
+    {
+        $removeConstant = false;
+        $GLOBALS['error_handler'] = new PMA_Error_Handler;
+        $GLOBALS['cfg']['Servers'] = array(1);
+        $GLOBALS['allowDeny_forbidden'] = false;
+        if (!defined('PMA_USR_BROWSER_AGENT')) {
+            define('PMA_USR_BROWSER_AGENT', 'chrome');
+            
+            $removeConstant = true;
+
+            if (! PMA_HAS_RUNKIT) {
+                $this->markTestSkipped('Cannot remove constant');
+            }
+        }
+
+        ob_start();
+        $result = $this->object->authFails();
+        $html = ob_get_clean();
+
+        $this->assertTrue(
+            $result
+        );
+
+        $this->assertContains(
+            'You probably did not create a configuration file. You might want ' .
+            'to use the <a href="setup/">setup script</a> to create one.',
+            $html
+        );
+
+        $this->assertContains(
+            '<strong>MySQL said: </strong><a href="./url.php?url=http%3A%2F%2F' .
+            'dev.mysql.com%2Fdoc%2Frefman%2F5.6%2Fen%2Ferror-messages-server.html' .
+            '&amp;server=0&amp;lang=en&amp;token=token" target="mysql_doc">' .
+            '<img src="themes/dot.gif" title="Documentation" alt="Documentation" ' .
+            'class="icon ic_b_help" /></a>',
+            $html
+        );
+
+        $this->assertContains(
+            'Cannot connect: invalid settings.',
+            $html
+        );
+
+        $this->assertContains(
+            '<a href="index.php?server=0&amp;lang=en&amp;token=token" ' .
+            'class="button disableAjax">Retry to connect</a>',
+            $html
+        );
+        if ($removeConstant) {
+            runkit_constant_remove('PMA_USR_BROWSER_AGENT');
+        }
+    }
+}
+?>
diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
new file mode 100644
index 0000000000..53e7b76bf9
--- /dev/null
+++ b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
@@ -0,0 +1,1109 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for AuthenticationCookie class
+ *
+ * @package PhpMyAdmin-test
+ */
+
+$GLOBALS['PMA_Config'] = new PMA_Config();
+
+require_once 'libraries/plugins/auth/AuthenticationCookie.class.php';
+require_once 'libraries/Util.class.php';
+require_once 'libraries/Message.class.php';
+require_once 'libraries/Theme.class.php';
+require_once 'libraries/Config.class.php';
+require_once 'libraries/php-gettext/gettext.inc';
+require_once 'libraries/config.default.php';
+require_once 'libraries/Error_Handler.class.php';
+
+/**
+ * tests for AuthenticationCookie class
+ *
+ * @package PhpMyAdmin-test
+ */
+class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase
+{
+    protected $object;
+
+    /**
+     * Configures global environment.
+     *
+     * @return void
+     */
+    function setup()
+    {
+        $GLOBALS['PMA_Config']->enableBc();
+        $GLOBALS['server'] = 0;
+        $this->object = new AuthenticationCookie(null);
+    }
+
+    /**
+     * tearDown for test cases
+     * 
+     * @return void
+     */
+    public function tearDown()
+    {
+        unset($this->object);
+    }
+
+    /**
+     * Test for AuthenticationConfig::auth
+     * 
+     * @return void
+     */
+    public function testAuth()
+    {
+        $restoreInstance = PMA_Response::getInstance();
+        // Case 1
+
+        $mockResponse = $this->getMockBuilder('PMA_Response')
+            ->disableOriginalConstructor()
+            ->setMethods(array('isAjax', 'isSuccess', 'addJSON'))
+            ->getMock();
+
+        $mockResponse->expects($this->once())
+            ->method('isAjax')
+            ->with()
+            ->will($this->returnValue(true));
+
+        $mockResponse->expects($this->once())
+            ->method('isSuccess')
+            ->with(false);
+
+        $mockResponse->expects($this->once())
+            ->method('addJSON')
+            ->with(
+                'message',
+                PMA_Message::error(
+                    '1<br /><br />[ <a href="https://phpmyadmin.net/" ' .
+                    'class="ajax login-link">Log in</a> ]'
+                )
+            );
+
+        $attrInstance = new ReflectionProperty('PMA_Response', '_instance');
+        $attrInstance->setAccessible(true); 
+        $attrInstance->setValue(null, $mockResponse);
+        $GLOBALS['conn_error'] = true;
+        $GLOBALS['cfg']['PmaAbsoluteUri'] = 'https://phpmyadmin.net/';
+        $this->assertTrue(
+            $this->object->auth()
+        );
+        // Case 2
+        
+        $mockResponse = $this->getMockBuilder('PMA_Response')
+            ->disableOriginalConstructor()
+            ->setMethods(array('isAjax', 'isSuccess', 'addJSON'))
+            ->getMock();
+
+        $mockResponse->expects($this->once())
+            ->method('isAjax')
+            ->with()
+            ->will($this->returnValue(true));
+
+        $mockResponse->expects($this->once())
+            ->method('isSuccess')
+            ->with(false);
+
+        $mockResponse->expects($this->once())
+            ->method('addJSON')
+            ->with(
+                'message',
+                PMA_Message::error(
+                    'Your session has expired. Please log in again.' .
+                    '<br /><br />[ <a href="https://phpmyadmin.net/" ' .
+                    'class="ajax login-link">Log in</a> ]'
+                )
+            );
+
+        $attrInstance = new ReflectionProperty('PMA_Response', '_instance');
+        $attrInstance->setAccessible(true); 
+        $attrInstance->setValue(null, $mockResponse);
+        $GLOBALS['conn_error'] = '';
+
+        $this->assertTrue(
+            $this->object->auth()
+        );
+
+        // case 3
+        
+        $mockResponse = $this->getMockBuilder('PMA_Response')
+            ->disableOriginalConstructor()
+            ->setMethods(array('isAjax', 'getFooter', 'getHeader'))
+            ->getMock();
+
+        $mockResponse->expects($this->once())
+            ->method('isAjax')
+            ->with()
+            ->will($this->returnValue(false));
+
+       
+
+        $_REQUEST['old_usr'] = '';
+        $GLOBALS['cfg']['LoginCookieRecall'] = true;
+        $GLOBALS['cfg']['blowfish_secret'] = 'secret';
+        $GLOBALS['PHP_AUTH_USER'] = 'pmauser';
+        $GLOBALS['pma_auth_server'] = 'localhost';
+
+        // mock footer
+        $mockFooter = $this->getMockBuilder('PMA_Footer')
+            ->disableOriginalConstructor()
+            ->setMethods(array('setMinimal'))
+            ->getMock();
+
+        $mockFooter->expects($this->once())
+            ->method('setMinimal')
+            ->with();
+
+        // mock header
+
+        $mockHeader = $this->getMockBuilder('PMA_Header')
+            ->disableOriginalConstructor()
+            ->setMethods(
+                array('setBodyId', 'setTitle', 'disableMenu', 'disableWarnings')
+            )
+            ->getMock();
+
+        $mockHeader->expects($this->once())
+            ->method('setBodyId')
+            ->with('loginform');
+        
+        $mockHeader->expects($this->once())
+            ->method('setTitle')
+            ->with('phpMyAdmin');
+
+        $mockHeader->expects($this->once())
+            ->method('disableMenu')
+            ->with();
+
+        $mockHeader->expects($this->once())
+            ->method('disableWarnings')
+            ->with();
+
+        // set mocked headers and footers
+
+        $mockResponse->expects($this->once())
+            ->method('getFooter')
+            ->with()
+            ->will($this->returnValue($mockFooter));
+
+        $mockResponse->expects($this->once())
+            ->method('getHeader')
+            ->with()
+            ->will($this->returnValue($mockHeader));
+
+        $attrInstance = new ReflectionProperty('PMA_Response', '_instance');
+        $attrInstance->setAccessible(true); 
+        $attrInstance->setValue(null, $mockResponse);
+
+        $GLOBALS['pmaThemeImage'] = 'test';
+        $GLOBALS['conn_error'] = true;
+        $GLOBALS['cfg']['Lang'] = 'en';
+        $GLOBALS['cfg']['AllowArbitraryServer'] = true;
+        $GLOBALS['cfg']['Servers'] = array(1, 2);
+        $_SESSION['last_valid_captcha'] = true;
+        $GLOBALS['target'] = 'testTarget';
+        $GLOBALS['db'] = 'testDb';
+        $GLOBALS['table'] = 'testTable';
+
+        file_put_contents('testlogo_right.png', '');
+
+        // mock error handler
+        
+        $mockErrorHandler = $this->getMockBuilder('PMA_Error_Handler')
+            ->disableOriginalConstructor()
+            ->setMethods(array('hasDisplayErrors', 'dispErrors'))
+            ->getMock();
+
+        $mockErrorHandler->expects($this->once())
+            ->method('hasDisplayErrors')
+            ->with()
+            ->will($this->returnValue(true));
+        
+        $mockErrorHandler->expects($this->once())
+            ->method('dispErrors')
+            ->with();
+
+        $GLOBALS['error_handler'] = $mockErrorHandler;
+
+        ob_start();
+        $this->object->auth();
+        $result = ob_get_clean();
+
+        // assertions
+        
+        $this->assertTag(
+            PMA_getTagArray(
+                '<img src="testlogo_right.png" id="imLogo"'
+            ),
+            $result
+        );
+        
+        $this->assertTag(
+            PMA_getTagArray(
+                '<div class="error">'
+            ),
+            $result
+        );
+
+        $this->assertTag(
+            PMA_getTagArray(
+                '<form method="post" action="index.php" name="login_form" ' .
+                'class="disableAjax login hide js-show">'
+            ),
+            $result
+        );
+
+        $this->assertTag(
+            PMA_getTagArray(
+                '<input type="text" name="pma_servername" id="input_servername" ' .
+                'value="localhost"'
+            ),
+            $result
+        );
+
+        $this->assertTag(
+            PMA_getTagArray(
+                '<input type="text" name="pma_username" id="input_username" ' .
+                'value="pmauser" size="24" class="textfield"/>'
+            ),
+            $result
+        );
+
+        $this->assertTag(
+            PMA_getTagArray(
+                '<input type="password" name="pma_password" id="input_password" ' .
+                'value="" size="24" class="textfield" />'
+            ),
+            $result
+        );
+
+        $this->assertTag(
+            PMA_getTagArray(
+                '<select name="server" id="select_server" ' .
+                'onchange="document.forms[\'login_form\'].' . 
+                'elements[\'pma_servername\'].value = \'\'" >'
+            ),
+            $result
+        );
+
+        $this->assertTag(
+            PMA_getTagArray(
+                '<input type="hidden" name="target" value="testTarget" />'
+            ),
+            $result
+        );
+
+        $this->assertTag(
+            PMA_getTagArray(
+                '<input type="hidden" name="db" value="testDb" />'
+            ),
+            $result
+        );
+
+        $this->assertTag(
+            PMA_getTagArray(
+                '<input type="hidden" name="table" value="testTable" />'
+            ),
+            $result
+        );
+
+        @unlink('testlogo_right.png');
+
+        // case 4
+        
+        $mockResponse = $this->getMockBuilder('PMA_Response')
+            ->disableOriginalConstructor()
+            ->setMethods(array('isAjax', 'getFooter', 'getHeader'))
+            ->getMock();
+
+        $mockResponse->expects($this->once())
+            ->method('isAjax')
+            ->with()
+            ->will($this->returnValue(false));
+
+        $mockResponse->expects($this->once())
+            ->method('getFooter')
+            ->with()
+            ->will($this->returnValue(new PMA_Footer()));
+
+        $mockResponse->expects($this->once())
+            ->method('getHeader')
+            ->with()
+            ->will($this->returnValue(new PMA_Header()));
+
+        $_REQUEST['old_usr'] = '';
+        $GLOBALS['cfg']['LoginCookieRecall'] = false;
+
+        $attrInstance = new ReflectionProperty('PMA_Response', '_instance');
+        $attrInstance->setAccessible(true); 
+        $attrInstance->setValue(null, $mockResponse);
+
+        $GLOBALS['pmaThemeImage'] = 'test';
+        $GLOBALS['cfg']['Lang'] = '';
+        $GLOBALS['cfg']['AllowArbitraryServer'] = false;
+        $GLOBALS['cfg']['Servers'] = array(1);
+        $_SESSION['last_valid_captcha'] = false;
+        $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = 'testprivkey';
+        $GLOBALS['cfg']['CaptchaLoginPublicKey'] = 'testpubkey';
+        $GLOBALS['server'] = 0;
+
+        $GLOBALS['error_handler'] = new PMA_Error_Handler;
+
+        ob_start();
+        $this->object->auth();
+        $result = ob_get_clean();
+
+        // assertions
+        
+        $this->assertTag(
+            PMA_getTagArray(
+                '<img name="imLogo" id="imLogo" src="testpma_logo.png"'
+            ),
+            $result
+        );
+        
+        $this->assertTag(
+            PMA_getTagArray(
+                '<select name="lang" class="autosubmit" lang="en" dir="ltr" ' .
+                'id="sel-lang">'
+            ),
+            $result
+        );
+
+        $this->assertTag(
+            PMA_getTagArray(
+                '<form method="post" action="index.php" name="login_form" ' .
+                'autocomplete="off" class="disableAjax login hide js-show">'
+            ),
+            $result
+        );
+
+        $this->assertTag(
+            PMA_getTagArray(
+                '<input type="hidden" name="server" value="0" />'
+            ),
+            $result
+        );
+
+        $this->assertContains(
+            'src="https://www.google.com/recaptcha/api/challenge?k=testpubkey">',
+            $result
+        );
+
+        $this->assertContains(
+            'iframe src="https://www.google.com/recaptcha/api/noscript' . 
+            '?k=testpubkey"',
+            $result
+        );
+
+        $this->assertContains(
+            '<textarea name="recaptcha_challenge_field" rows="3" cols="40">',
+            $result
+        );
+
+        $this->assertContains(
+            '<input type="hidden" name="recaptcha_response_field"',
+            $result
+        );
+
+        $this->assertContains(
+            '$("#recaptcha_reload_btn").addClass("disableAjax");',
+            $result
+        );
+
+        $this->assertContains(
+            '$("#recaptcha_switch_audio_btn").addClass("disableAjax");',
+            $result
+        );
+
+        $this->assertContains(
+            '$("#recaptcha_switch_img_btn").addClass("disableAjax");',
+            $result
+        );
+
+        $attrInstance->setValue(null, $restoreInstance);
+    }
+
+    /**
+     * Test for AuthenticationConfig::auth with headers
+     * 
+     * @return void
+     */
+    public function testAuthHeader()
+    {
+        if (!defined('PMA_TEST_HEADERS')) {
+            $this->markTestSkipped(
+                'Cannot redefine constant/function - missing runkit extension'
+            );
+        }
+
+        $restoreInstance = PMA_Response::getInstance();
+
+        $mockResponse = $this->getMockBuilder('PMA_Response')
+            ->disableOriginalConstructor()
+            ->setMethods(array('isAjax'))
+            ->getMock();
+
+        $mockResponse->expects($this->once())
+            ->method('isAjax')
+            ->with()
+            ->will($this->returnValue(false));
+
+        $attrInstance = new ReflectionProperty('PMA_Response', '_instance');
+        $attrInstance->setAccessible(true); 
+        $attrInstance->setValue(null, $mockResponse);
+
+        $_REQUEST['old_usr'] = 'user1';
+        $GLOBALS['cfg']['Server']['LogoutURL'] = 'http://www.phpmyadmin.net/logout';
+
+        $this->assertTrue(
+            $this->object->auth()
+        );
+
+        $this->assertContains(
+            'Location: http://www.phpmyadmin.net/logout?PHPSESSID=',
+            $GLOBALS['header'][0]
+        );
+
+        $attrInstance->setValue(null, $restoreInstance);
+    }
+
+    /**
+     * Test for AuthenticationConfig::authCheck
+     * 
+     * @return void
+     */
+    public function testAuthCheck()
+    {
+        $defineAgain = 'PMA_TEST_NO_DEFINE';
+
+        if (defined('PMA_CLEAR_COOKIES')) {
+            if (! PMA_HAS_RUNKIT) {
+                $this->markTestSkipped(
+                    'Cannot redefine constant/function - missing runkit extension'
+                );
+            } else {
+                $defineAgain = PMA_CLEAR_COOKIES;
+                runkit_constant_remove('PMA_CLEAR_COOKIES');
+            }
+        }
+
+        $GLOBALS['cfg']['Server']['auth_swekey_config'] = 'testConfigSwekey';
+        
+        file_put_contents('testConfigSwekey', '');
+        $this->assertFalse(
+            $this->object->authCheck()
+        );
+        @unlink('testConfigSwekey');
+
+        // case 2
+
+        $_SESSION['last_valid_captcha'] = false;
+        $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = 'testprivkey';
+        $GLOBALS['cfg']['CaptchaLoginPublicKey'] = 'testpubkey';
+        $_POST["recaptcha_challenge_field"] = 'captcha1';
+        $_POST["recaptcha_response_field"] = '';
+        
+        $this->assertFalse(
+            $this->object->authCheck()
+        );
+
+        $this->assertEquals(
+            'Please enter correct captcha!',
+            $GLOBALS['conn_error']
+        );
+
+        // case 3
+
+        $_SESSION['last_valid_captcha'] = false;
+        $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = 'testprivkey';
+        $GLOBALS['cfg']['CaptchaLoginPublicKey'] = 'testpubkey';
+        $_POST["recaptcha_challenge_field"] = '';
+        $_POST["recaptcha_response_field"] = '';
+        
+        $this->assertFalse(
+            $this->object->authCheck()
+        );
+
+        // case 4
+
+        $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = '';
+        $GLOBALS['cfg']['CaptchaLoginPublicKey'] = '';
+        $_REQUEST['old_usr'] = 'pmaolduser';
+        $GLOBALS['cfg']['LoginCookieDeleteAll'] = true;
+        $GLOBALS['cfg']['Servers'] = array(1);
+
+        $_COOKIE['pmaPass-0'] = 'test';
+
+        $this->object->authCheck();
+
+        $this->assertFalse(
+            isset($_COOKIE['pmaPass-0'])
+        );
+
+        // case 5
+
+        $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = '';
+        $GLOBALS['cfg']['CaptchaLoginPublicKey'] = '';
+        $_REQUEST['old_usr'] = 'pmaolduser';
+        $GLOBALS['cfg']['LoginCookieDeleteAll'] = false;
+        $GLOBALS['cfg']['Servers'] = array(1);
+        $GLOBALS['server'] = 1;
+
+        $_COOKIE['pmaPass-1'] = 'test';
+
+        $this->object->authCheck();
+
+        $this->assertFalse(
+            isset($_COOKIE['pmaPass-1'])
+        );
+
+        // case 6
+
+        $_SESSION['last_valid_captcha'] = true;
+        $_REQUEST['old_usr'] = '';
+        $_REQUEST['pma_username'] = 'testPMAUser';
+        $_REQUEST['pma_servername'] = 'testPMAServer';
+        $_REQUEST['pma_password'] = 'testPMAPSWD';
+        $GLOBALS['cfg']['AllowArbitraryServer'] = true;
+
+        $this->assertTrue(
+            $this->object->authCheck()
+        );
+
+        $this->assertEquals(
+            'testPMAUser',
+            $GLOBALS['PHP_AUTH_USER']
+        );
+        
+        $this->assertEquals(
+            'testPMAPSWD',
+            $GLOBALS['PHP_AUTH_PW']
+        );
+
+        $this->assertEquals(
+            'testPMAServer',
+            $GLOBALS['pma_auth_server']
+        );
+
+        $this->assertFalse(
+            isset($_COOKIE['pmaPass-1'])
+        );
+
+        // case 7
+
+        $_REQUEST['pma_username'] = '';
+        $GLOBALS['server'] = 1;
+        $_COOKIE['pmaServer-1'] = 'pmaServ1';
+        $_COOKIE['pmaUser-1'] = '';
+        
+        $this->assertFalse(
+            $this->object->authCheck()
+        );
+
+        $this->assertEquals(
+            'pmaServ1',
+            $GLOBALS['pma_auth_server']
+        );
+
+        // case 8
+
+        $GLOBALS['server'] = 1;
+        $_COOKIE['pmaServer-1'] = 'pmaServ1';
+        $_COOKIE['pmaUser-1'] = 'pmaUser1';
+        $_COOKIE['pmaPass-1'] = '';
+        $GLOBALS['cfg']['blowfish_secret'] = 'secret';
+        $_SESSION['last_access_time'] = time() - 1000;
+        $GLOBALS['cfg']['LoginCookieValidity'] = 1440;
+
+        $this->assertFalse(
+            $this->object->authCheck()
+        );
+
+
+        if ($defineAgain !== 'PMA_TEST_NO_DEFINE') {
+            define('PMA_CLEAR_COOKIES', $defineAgain);
+        }
+    }
+
+    /**
+     * Test for AuthenticationConfig::authCheck with constant modifications
+     * 
+     * @return void
+     */
+    public function testAuthCheckWithConstants()
+    {
+        if (!defined('PMA_CLEAR_COOKIES') && !PMA_HAS_RUNKIT) {
+            $this->markTestSkipped(
+                'Cannot redefine constant/function - missing runkit extension'
+            );
+        }
+        
+        $remove = false;
+
+        if (! defined('PMA_CLEAR_COOKIES')) {
+            define('PMA_CLEAR_COOKIES', true);
+            $remove = true;
+        }
+        
+        $GLOBALS['cfg']['Server']['auth_swekey_config'] = 'testConfigSwekey';
+        $GLOBALS['cfg']['Servers'] = array(1);
+        $_COOKIE['pmaPass-0'] = 1;
+        $_COOKIE['pmaServer-0'] = 1;
+        $_COOKIE['pmaUser-0'] = 1;
+
+        $this->assertFalse(
+            $this->object->authCheck()
+        );
+
+        $this->assertFalse(
+            isset($_COOKIE['pmaPass-0'])
+        );
+
+        $this->assertFalse(
+            isset($_COOKIE['pmaServer-0'])
+        );
+
+        $this->assertFalse(
+            isset($_COOKIE['pmaUser-0'])
+        );
+
+        if ($remove) {
+            runkit_constant_remove('PMA_CLEAR_COOKIES');
+        }
+    }
+
+    /**
+     * Test for AuthenticationConfig::authCheck (mock blowfish functions reqd)
+     * 
+     * @return void
+     */
+    public function testAuthCheckBlowfishCase()
+    {   
+        $GLOBALS['cfg']['Server']['auth_swekey_config'] = 'testConfigSwekey';
+        $GLOBALS['server'] = 1;
+        $_REQUEST['old_usr'] = '';
+        $_REQUEST['pma_username'] = '';
+        $_COOKIE['pmaServer-1'] = 'pmaServ1';
+        $_COOKIE['pmaUser-1'] = 'pmaUser1';
+        $GLOBALS['cfg']['blowfish_secret'] = 'secret';
+        $_SESSION['last_access_time'] = '';
+        $_SESSION['last_valid_captcha'] = true;
+
+        // mock for blowfish function
+        $this->object = $this->getMockBuilder('AuthenticationCookie')
+            ->disableOriginalConstructor()
+            ->setMethods(array('blowfishDecrypt'))
+            ->getMock();
+
+        $this->object->expects($this->once())
+            ->method('blowfishDecrypt')
+            ->will($this->returnValue('testBF'));
+
+        $this->assertFalse(
+            $this->object->authCheck()
+        );
+
+        $this->assertEquals(
+            'testBF',
+            $GLOBALS['PHP_AUTH_USER']
+        );
+    }
+
+    /**
+     * Test for AuthenticationConfig::authCheck (mocking blowfish functions)
+     * 
+     * @return void
+     */
+    public function testAuthCheckBlowfishCaseSecond()
+    {   
+        $GLOBALS['cfg']['Server']['auth_swekey_config'] = 'testConfigSwekey';
+        $GLOBALS['server'] = 1;
+        $_REQUEST['old_usr'] = '';
+        $_REQUEST['pma_username'] = '';
+        $_COOKIE['pmaServer-1'] = 'pmaServ1';
+        $_COOKIE['pmaUser-1'] = 'pmaUser1';
+        $_COOKIE['pmaPass-1'] = 'pmaPass1';
+        $GLOBALS['cfg']['blowfish_secret'] = 'secret';
+        $_SESSION['last_valid_captcha'] = true;
+        $_SESSION['last_access_time'] = time() - 1000;
+        $GLOBALS['cfg']['LoginCookieValidity'] = 1440;
+        
+        // mock for blowfish function
+        $this->object = $this->getMockBuilder('AuthenticationCookie')
+            ->disableOriginalConstructor()
+            ->setMethods(array('blowfishDecrypt'))
+            ->getMock();
+
+        $this->object->expects($this->at(1))
+            ->method('blowfishDecrypt')
+            ->will($this->returnValue("\xff(blank)"));
+
+        $this->assertTrue(
+            $this->object->authCheck()
+        );
+
+        $this->assertTrue(
+            $GLOBALS['from_cookie']
+        );
+
+        $this->assertEquals(
+            '',
+            $GLOBALS['PHP_AUTH_PW']
+        );
+
+    }
+
+    /**
+     * Test for AuthenticationConfig::authCheck (mocking the object itself)
+     * 
+     * @return void
+     */
+    public function testAuthCheckAuthFails()
+    {   
+        $GLOBALS['cfg']['Server']['auth_swekey_config'] = 'testConfigSwekey';
+        $GLOBALS['server'] = 1;
+        $_REQUEST['old_usr'] = '';
+        $_REQUEST['pma_username'] = '';
+        $_COOKIE['pmaServer-1'] = 'pmaServ1';
+        $_COOKIE['pmaUser-1'] = 'pmaUser1';
+        $GLOBALS['cfg']['blowfish_secret'] = 'secret';
+        $_SESSION['last_access_time'] = 1;
+        $_SESSION['last_valid_captcha'] = true;
+        $GLOBALS['cfg']['LoginCookieValidity'] = 0;
+        $_SESSION['last_access_time'] = -1;
+        // mock for blowfish function
+        $this->object = $this->getMockBuilder('AuthenticationCookie')
+            ->disableOriginalConstructor()
+            ->setMethods(array('authFails'))
+            ->getMock();
+
+        $this->object->expects($this->once())
+            ->method('authFails');
+
+        $this->assertFalse(
+            $this->object->authCheck()
+        );
+
+        $this->assertTrue(
+            $GLOBALS['no_activity']
+        );
+    }
+
+    /**
+     * Test for AuthenticationConfig::authSetUser
+     * 
+     * @return void
+     */
+    public function testAuthSetUser()
+    {
+        $GLOBALS['PHP_AUTH_USER'] = 'pmaUser2';
+        $arr = array(
+            'host' => 'a',
+            'port' => 1,
+            'socket' => true,
+            'ssl' => true,
+            'connect_type' => 'port',
+            'user' => 'pmaUser2'
+        );
+
+        $GLOBALS['cfg']['Server'] = $arr;
+        $GLOBALS['cfg']['Server']['user'] = 'pmaUser';
+        $GLOBALS['cfg']['Servers'][1] = $arr;
+        $GLOBALS['cfg']['AllowArbitraryServer'] = true;
+        $GLOBALS['pma_auth_server'] = 'b 2';
+        $GLOBALS['PHP_AUTH_PW'] = $_SERVER['PHP_AUTH_PW'] = 'testPW';
+        $GLOBALS['server'] = 2;
+        $GLOBALS['cfg']['LoginCookieStore'] = true;
+        $GLOBALS['from_cookie'] = true;
+
+        $this->object->authSetUser();
+
+        $this->assertFalse(
+            isset($GLOBALS['PHP_AUTH_PW'])
+        );
+
+        $this->assertFalse(
+            isset($_SERVER['PHP_AUTH_PW'])
+        );
+
+        $this->assertTrue(
+            isset($_COOKIE['pmaUser-1'])
+        );
+
+        $this->assertTrue(
+            isset($_COOKIE['pmaPass-1'])
+        );
+
+        $arr['password'] = 'testPW';
+        $arr['host'] = 'b';
+        $arr['port'] = '2';
+        $this->assertEquals(
+            $arr,
+            $GLOBALS['cfg']['Server']
+        );
+
+    }
+
+    /**
+     * Test for AuthenticationConfig::authSetUser (check for headers redirect)
+     * 
+     * @return void
+     */
+    public function testAuthSetUserWithHeaders()
+    {
+        if (!defined('PMA_TEST_HEADERS')) {
+            $this->markTestSkipped(
+                'Cannot redefine constant/function - missing runkit extension'
+            );
+        }
+
+        $GLOBALS['PHP_AUTH_USER'] = 'pmaUser2';
+        $arr = array(
+            'host' => 'a',
+            'port' => 1,
+            'socket' => true,
+            'ssl' => true,
+            'connect_type' => 'port',
+            'user' => 'pmaUser2'
+        );
+
+        $GLOBALS['cfg']['Server'] = $arr;
+        $GLOBALS['cfg']['Server']['host'] = 'b';
+        $GLOBALS['cfg']['Server']['user'] = 'pmaUser';
+        $GLOBALS['cfg']['Servers'][1] = $arr;
+        $GLOBALS['cfg']['AllowArbitraryServer'] = true;
+        $GLOBALS['pma_auth_server'] = 'b 2';
+        $GLOBALS['PHP_AUTH_PW'] = $_SERVER['PHP_AUTH_PW'] = 'testPW';
+        $GLOBALS['server'] = 2;
+        $GLOBALS['cfg']['LoginCookieStore'] = true;
+        $GLOBALS['from_cookie'] = false;
+        $GLOBALS['cfg']['PmaAbsoluteUri'] = 'http://phpmyadmin.net/';
+        $GLOBALS['collation_connection'] = 'utf-8';
+
+        $restoreInstance = PMA_Response::getInstance();
+
+        $mockResponse = $this->getMockBuilder('PMA_Response')
+            ->disableOriginalConstructor()
+            ->setMethods(array('disable'))
+            ->getMock();
+
+        $mockResponse->expects($this->at(0))
+            ->method('disable');
+
+        $attrInstance = new ReflectionProperty('PMA_Response', '_instance');
+        $attrInstance->setAccessible(true); 
+        $attrInstance->setValue(null, $mockResponse);
+
+        $this->object->authSetUser();
+        
+        $this->assertTrue(
+            isset($_COOKIE['pmaServer-2'])
+        );
+
+        $this->assertContains(
+            'Location: http://phpmyadmin.net/index.php?target=phpunit&server=2' .
+            '&lang=en&collation_connection=utf-8&token=token&PHPSESSID=',
+            $GLOBALS['header'][0]
+        );
+
+        $attrInstance->setValue(null, $restoreInstance);
+    }
+
+    /**
+     * Test for AuthenticationConfig::authFails
+     * 
+     * @return void
+     */
+    public function testAuthFails()
+    {
+        if (!defined('PMA_TEST_HEADERS')) {
+            $this->markTestSkipped(
+                'Cannot redefine constant/function - missing runkit extension'
+            );
+        }
+
+        $this->object = $this->getMockBuilder('AuthenticationCookie')
+            ->disableOriginalConstructor()
+            ->setMethods(array('auth'))
+            ->getMock();
+
+        $this->object->expects($this->exactly(5))
+            ->method('auth');
+
+        $GLOBALS['server'] = 2;
+        $_COOKIE['pmaPass-2'] = 'pass';
+
+        // case 1
+
+        $GLOBALS['login_without_password_is_forbidden'] = '1';
+
+        $this->object->authFails();
+
+        $this->assertEquals(
+            $GLOBALS['conn_error'],
+            'Login without a password is forbidden by configuration'
+            . ' (see AllowNoPassword)'
+        );
+
+        $this->assertEquals(
+            $GLOBALS['header'],
+            array(
+                'Cache-Control: no-store, no-cache, must-revalidate',
+                'Pragma: no-cache'
+            )
+        );
+
+        // case 2
+
+        $GLOBALS['login_without_password_is_forbidden'] = '';
+        $GLOBALS['allowDeny_forbidden'] = '1';
+
+        $this->object->authFails();
+
+        $this->assertEquals(
+            $GLOBALS['conn_error'],
+            'Access denied'
+        );
+
+        // case 3
+
+        $GLOBALS['allowDeny_forbidden'] = '';
+        $GLOBALS['no_activity'] = '1';
+        $GLOBALS['cfg']['LoginCookieValidity'] = 10;
+
+        $this->object->authFails();
+
+        $this->assertEquals(
+            $GLOBALS['conn_error'],
+            'No activity within 10 seconds; please log in again.'
+        );
+
+        // case 4
+
+        $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $dbi->expects($this->at(0))
+            ->method('getError')
+            ->will($this->returnValue(true));
+
+        $dbi->expects($this->at(1))
+            ->method('getError')
+            ->will($this->returnValue(false));
+
+        $GLOBALS['dbi'] = $dbi;
+        $GLOBALS['no_activity'] = '';
+        $GLOBALS['errno'] = 42;
+
+        $this->object->authFails();
+
+        $this->assertEquals(
+            $GLOBALS['conn_error'],
+            '#42 Cannot log in to the MySQL server'
+        );
+
+        // case 5
+
+        $this->object->authFails();
+
+        $this->assertEquals(
+            $GLOBALS['conn_error'],
+            'Cannot log in to the MySQL server'
+        );
+    }
+
+    /**
+     * Test for AuthenticationConfig::_getBlowfishSecret
+     * 
+     * @return void
+     */
+    public function testGetBlowfishSecret()
+    {
+        $method = new \ReflectionMethod(
+            'AuthenticationCookie',
+            '_getBlowfishSecret'
+        );
+        $method->setAccessible(true);
+
+        // case 1
+
+        $GLOBALS['cfg']['blowfish_secret'] = '';
+        $_SESSION['auto_blowfish_secret'] = '';
+
+        $result = $method->invoke($this->object, null);
+
+        $this->assertEquals(
+            $result,
+            $_SESSION['auto_blowfish_secret']
+        );
+
+        $this->assertEquals(
+            23,
+            strlen($result)
+        );
+
+        // case 2
+        
+        $GLOBALS['cfg']['blowfish_secret'] = 'notEmpty';
+
+        $result = $method->invoke($this->object, null);
+
+        $this->assertEquals(
+            md5('notEmpty'),
+            $result
+        );
+    }
+
+    /**
+     * Test for AuthenticationConfig::blowfishEncrypt
+     * 
+     * @return void
+     */
+    public function testBlowfishEncrypt()
+    {   
+        if (! function_exists('mcrypt_encrypt')) {
+            $this->assertEquals(
+                '/xytF/kXKuBx7zHzGexkFw==',
+                $this->object->blowfishEncrypt('data123', 'sec321')
+            );
+        } else {
+            $this->assertEquals(
+                base64_encode(
+                    mcrypt_encrypt(
+                        MCRYPT_BLOWFISH,
+                        'sec321',
+                        'data123',
+                        MCRYPT_MODE_CBC,
+                        $GLOBALS['iv']
+                    )
+                ),
+                $this->object->blowfishEncrypt('data123', 'sec321')
+            );
+        }
+    }
+
+    /**
+     * Test for AuthenticationConfig::blowfishDecrypt
+     * 
+     * @return void
+     */
+    public function testBlowfishDecrypt()
+    {   
+        if (! function_exists('mcrypt_encrypt')) {
+            $this->assertEquals(
+                'data123',
+                $this->object->blowfishDecrypt(
+                    '/xytF/kXKuBx7zHzGexkFw==',
+                    'sec321'
+                )
+            );
+        }
+    }
+
+
+}
+?>
diff --git a/test/libraries/PMA_FormDisplay_tpl_test.php b/test/libraries/PMA_FormDisplay_tpl_test.php
index c9ddc07b80..371f7c8a7d 100644
--- a/test/libraries/PMA_FormDisplay_tpl_test.php
+++ b/test/libraries/PMA_FormDisplay_tpl_test.php
@@ -21,34 +21,6 @@ require_once 'libraries/user_preferences.lib.php';
  */
 class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
 {
-    /**
-     * Return the tag array to be used with assertTag by parsing
-     * a given HTML element
-     *
-     * @param string $elementHTML HTML for element to be parsed
-     * @param array  $arr         Additional array elements like content, parent
-     *
-     * @return array              Tag array to be used with assertTag
-     */
-    private function _getTagArray($elementHTML, $arr = array())
-    {
-
-        // get attributes
-        preg_match_all("/\s+(.*?)\=\s*\"(.*?)\"/is", $elementHTML, $matches);
-        foreach ($matches[1] as $key => $val) {
-            $arr['attributes'][trim($val)] = trim($matches[2][$key]);
-        }
-        $matches = array();
-
-        // get tag
-        preg_match("/^\<(.*?)(\s|\>)/i", $elementHTML, $matches);
-        if (isset($matches[1])) {
-            $arr['tag'] = trim($matches[1]);
-        }
-
-        return $arr;
-    }
-
     /**
      * Test for PMA_displayFormTop()
      *
@@ -63,7 +35,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         $result = ob_get_clean();
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<form method="get" action="http://www.phpmyadmin.net" ' .
                 'class="config-form disableAjax">'
             ),
@@ -71,14 +43,14 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<input type="hidden" name="tab_hash" value="" />'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<input type="hidden" name="check_page_refresh"  ' .
                 'id="check_page_refresh" value="" />'
             ),
@@ -86,21 +58,21 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<input type="hidden" name="lang" value="en" />'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<input type="hidden" name="token" value="token" />'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<input type="hidden" name="0" value="1" />'
             ),
             $result
@@ -119,22 +91,22 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         $result = ob_get_clean();
 
         $this->assertTag(
-            $this->_getTagArray('<ul class="tabs">'),
+            PMA_getTagArray('<ul class="tabs">'),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray('<a href="#0">', array('content' => 'one')),
+            PMA_getTagArray('<a href="#0">', array('content' => 'one')),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray('<a href="#1">', array('content' => 'two')),
+            PMA_getTagArray('<a href="#1">', array('content' => 'two')),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray('<div class="tabs_contents">'),
+            PMA_getTagArray('<div class="tabs_contents">'),
             $result
         );
     }
@@ -154,14 +126,14 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         $result = ob_get_clean();
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<fieldset class="optbox" name="attrname">'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<legend>',
                 array(
                     'content' => 'TitleTest',
@@ -172,7 +144,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<p>',
                 array(
                     'content' => 'DescTest',
@@ -182,14 +154,14 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<dl class="errors">'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<dd>',
                 array('content' => 'e1', 'parent' => array('tag' => 'dl'))
             ),
@@ -197,7 +169,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<dd>',
                 array('content' => 'e2', 'parent' => array('tag' => 'dl'))
             ),
@@ -205,7 +177,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<table width="100%" cellspacing="0">'
             ),
             $result
@@ -243,14 +215,14 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         $result = ob_get_clean();
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<tr class="group-header-field group-header-1 disabled-field">'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<label for="test/path">',
                 array('content' => 'testName')
             ),
@@ -258,7 +230,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<a href="http://doclink" target="documentation">',
                 array(
                     'parent' => array(
@@ -271,7 +243,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<img src="testImageb_help.png" title="Documentation" ' .
                 'alt="Documentation" />',
                 array(
@@ -282,28 +254,28 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<a href="http://wikilink" target="wiki">'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<img src="testImageb_info.png" title="Wiki" alt="Wiki" />'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<span class="disabled-notice">'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<small>',
                 array('content' => 'desc')
             ),
@@ -311,7 +283,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<input type="text" size="60" name="test/path" id="test/path" ' .
                 'class="custom field-error" value="val" />'
             ),
@@ -319,7 +291,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<span class="field-comment-mark field-comment-warning" title="testComment">',
                 array('content' => 'i')
             ),
@@ -327,7 +299,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<a class="restore-default" href="#test/path" ' .
                 'style="display:none">'
             ),
@@ -360,14 +332,14 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         $result = ob_get_clean();
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<tr class="group-field group-field-1">'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<input type="checkbox" name="test/path" id="test/path" ' .
                 'checked="checked" />',
                 array(
@@ -381,7 +353,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<a class="userprefs-comment" title="userprefsComment">',
                 array('child' => array('tag' => 'img'))
             ),
@@ -389,11 +361,11 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<td class="userprefs-allow" title="Allow users to customize ' .
                 'this value">',
                 array(
-                    'child' => $this->_getTagArray(
+                    'child' => PMA_getTagArray(
                         '<input type="checkbox" name="test/path-userprefs-allow" ' .
                         'checked="checked"/>'
                     )
@@ -403,7 +375,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<a class="set-value" href="#test/path=setVal" ' .
                 'title="Set value: setVal" style="display:none">',
                 array('child' => array('tag' => 'img'))
@@ -425,7 +397,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         $result = ob_get_clean();
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<input type="text" size="25" name="test/path" id="test/path" ' .
                 'value="val" />'
             ),
@@ -441,7 +413,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         $result = ob_get_clean();
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<input type="text" size="15" name="test/path" ' .
                 'id="test/path" value="val" />'
             ),
@@ -463,21 +435,21 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
         $result = ob_get_clean();
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<select name="test/path" id="test/path">'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<select name="test/path" id="test/path">'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<option value="1" selected="selected" disabled="disabled">',
                 array(
                     'parent' => array('tag' => 'select'),
@@ -488,7 +460,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<option value="key1">',
                 array(
                     'parent' => array('tag' => 'select'),
@@ -499,7 +471,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<option value="key2">',
                 array(
                     'parent' => array('tag' => 'select'),
@@ -525,14 +497,14 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         $result = ob_get_clean();
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<select name="test/path" id="test/path">'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<select name="test/path" id="test/path">'
             ),
             $result
@@ -554,7 +526,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         $result = ob_get_clean();
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<textarea cols="40" rows="5" name="test/path" id="test/path">',
                 array(
                     'content' => "foo\nbar"
@@ -591,10 +563,10 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         $result = ob_get_clean();
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<tr class="group-header group-header-4">',
                 array(
-                    'child' => $this->_getTagArray(
+                    'child' => PMA_getTagArray(
                         '<th colspan="3">',
                         array(
                             'content' => 'headerText'
@@ -615,10 +587,10 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         $result = ob_get_clean();
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<tr class="group-header group-header-4">',
                 array(
-                    'child' => $this->_getTagArray(
+                    'child' => PMA_getTagArray(
                         '<th colspan="2">',
                         array(
                             'content' => 'headerText'
@@ -668,14 +640,14 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         $result = ob_get_clean();
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<td colspan="3" class="lastrow">'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<input type="submit" name="submit_save" value="Apply"',
                 array(
                     'parent' => array('tag' => 'td')
@@ -685,7 +657,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<input type="button" name="submit_reset" value="Reset" />',
                 array(
                     'parent' => array('tag' => 'td')
@@ -708,7 +680,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         $result = ob_get_clean();
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<td colspan="2" class="lastrow">'
             ),
             $result
diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php
index 620081221b..11382a45dc 100644
--- a/test/libraries/PMA_user_preferences_test.php
+++ b/test/libraries/PMA_user_preferences_test.php
@@ -416,35 +416,35 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
         $result = PMA_userprefsAutoloadGetHeader();
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<form action="prefs_manage.php" method="post">'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<input type="hidden" name="token" value="token"'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<input type="hidden" name="json" value="" />'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<input type="hidden" name="submit_import" value="1" />'
             ),
             $result
         );
 
         $this->assertTag(
-            $this->_getTagArray(
+            PMA_getTagArray(
                 '<input type="hidden" name="return_url" value="phpunit?" />'
             ),
             $result