diff --git a/tests/Aauth/Libraries/Aauth/ErrorsTest.php b/tests/Aauth/Libraries/Aauth/ErrorsTest.php
index e3e7175..a405473 100644
--- a/tests/Aauth/Libraries/Aauth/ErrorsTest.php
+++ b/tests/Aauth/Libraries/Aauth/ErrorsTest.php
@@ -90,6 +90,7 @@ class ErrorsTest extends \CIUnitTestCase
 		$this->library->error('test message 1', true);
 		$this->assertEquals(['test message 1'], $session->getFlashdata('errors'));
 		$this->library->clearErrors();
+		$this->assertEquals([], $this->library->getErrorsArray());
 		$this->assertNull($session->getFlashdata('errors'));
 	}
 
@@ -112,7 +113,20 @@ class ErrorsTest extends \CIUnitTestCase
         $session->start();
 		$this->library->keepErrors();
         $session->start();
-		$this->assertEquals(['test message 1'], $this->library->getErrorsArray());
+		$this->assertEquals(['test message 1'], $session->getFlashdata('errors'));
+	}
+
+	public function testErrorsFlashKeepMerge()
+	{
+        $session = $this->getInstance();
+	    $this->library = new Aauth(NULL, $session);
+		$this->assertNull($session->getFlashdata('errors'));
+		$this->library->error('test message 1 Flash', true);
+        $session->start();
+		$this->library->error('test message 1 NonFlash');
+		$this->library->keepErrors(true);
+        $session->start();
+		$this->assertEquals(['test message 1 Flash', 'test message 1 NonFlash'], $session->getFlashdata('errors'));
 	}
 
 	public function testErrorsFlashArray()
diff --git a/tests/Aauth/Libraries/Aauth/InfosTest.php b/tests/Aauth/Libraries/Aauth/InfosTest.php
index 2f358c7..d095e38 100644
--- a/tests/Aauth/Libraries/Aauth/InfosTest.php
+++ b/tests/Aauth/Libraries/Aauth/InfosTest.php
@@ -17,6 +17,7 @@ class InfosTest extends \CIUnitTestCase
     {
         parent::setUp();
 
+	    $this->library = new Aauth(null, true);
         $_COOKIE = [];
         $_SESSION = [];
     }
@@ -55,7 +56,6 @@ class InfosTest extends \CIUnitTestCase
 
 	public function testInfos()
 	{
-	    $this->library = new Aauth(NULL, TRUE);
 		$this->assertCount(0, $this->library->getInfosArray());
 		$this->library->info('test message 1');
 		$this->assertEquals(['test message 1'], $this->library->getInfosArray());
@@ -63,7 +63,6 @@ class InfosTest extends \CIUnitTestCase
 
 	public function testInfosArray()
 	{
-	    $this->library = new Aauth(NULL, TRUE);
 		$this->assertCount(0, $this->library->getInfosArray());
 		$this->library->info(['test message 1','test message 2']);
 		$this->assertEquals(['test message 1','test message 2'], $this->library->getInfosArray());
@@ -71,7 +70,6 @@ class InfosTest extends \CIUnitTestCase
 
 	public function testPrintInfosReturn()
 	{
-	    $this->library = new Aauth(NULL, TRUE);
 		$this->library->info('test message 1');
 		$this->assertEquals('test message 1', $this->library->printInfos('<br />', true));
 		$this->library->info('test message 2');
@@ -80,7 +78,6 @@ class InfosTest extends \CIUnitTestCase
 
 	public function testPrintInfosEcho()
 	{
-	    $this->library = new Aauth(NULL, TRUE);
 		$this->library->info('test message 1');
  		$this->library->printInfos('<br />');
  		$this->expectOutputString('test message 1');
@@ -93,6 +90,7 @@ class InfosTest extends \CIUnitTestCase
 		$this->library->info('test message 1', true);
 		$this->assertEquals(['test message 1'], $session->getFlashdata('infos'));
 		$this->library->clearInfos();
+		$this->assertEquals([], $this->library->getInfosArray());
 		$this->assertNull($session->getFlashdata('infos'));
 	}
 
@@ -102,15 +100,42 @@ class InfosTest extends \CIUnitTestCase
 	    $this->library = new Aauth(NULL, $session);
 		$this->assertNull($session->getFlashdata('infos'));
 		$this->library->info('test message 1', true);
+        $session->start();
+		$this->assertEquals(['test message 1'], $session->getFlashdata('infos'));
+	}
+
+	public function testInfosFlashKeep()
+	{
+        $session = $this->getInstance();
+	    $this->library = new Aauth(NULL, $session);
+		$this->assertNull($session->getFlashdata('infos'));
+		$this->library->info('test message 1', true);
+        $session->start();
+		$this->library->keepInfos();
+        $session->start();
 		$this->assertEquals(['test message 1'], $session->getFlashdata('infos'));
 	}
 
+	public function testInfosFlashKeepMerge()
+	{
+        $session = $this->getInstance();
+	    $this->library = new Aauth(NULL, $session);
+		$this->assertNull($session->getFlashdata('infos'));
+		$this->library->info('test message 1 Flash', true);
+        $session->start();
+		$this->library->info('test message 1 NonFlash');
+		$this->library->keepInfos(true);
+        $session->start();
+		$this->assertEquals(['test message 1 Flash', 'test message 1 NonFlash'], $session->getFlashdata('infos'));
+	}
+
 	public function testInfosFlashArray()
 	{
         $session = $this->getInstance();
 	    $this->library = new Aauth(NULL, $session);
 		$this->assertNull($session->getFlashdata('infos'));
 		$this->library->info(['test message 1','test message 2'], true);
+        $session->start();
 		$this->assertEquals(['test message 1','test message 2'], $session->getFlashdata('infos'));
 	}
 }