diff --git a/tests/system/Log/ChromeLoggerHandlerTest.php b/tests/system/Log/ChromeLoggerHandlerTest.php
index b57848b3bd..f23e130962 100644
--- a/tests/system/Log/ChromeLoggerHandlerTest.php
+++ b/tests/system/Log/ChromeLoggerHandlerTest.php
@@ -1,6 +1,7 @@
 <?php namespace CodeIgniter\Log\Handlers;
 
 use Tests\Support\Config\MockLogger as LoggerConfig;
+use Tests\Support\Log\Handlers\MockChromeHandler;
 use CodeIgniter\Services;
 
 class ChromeLoggerHandlerTest extends \CIUnitTestCase
@@ -55,4 +56,23 @@ class ChromeLoggerHandlerTest extends \CIUnitTestCase
 		$this->assertObjectHasAttribute('dateFormat', $logger);
 	}
 
+	//--------------------------------------------------------------------
+
+	public function testObjectMessage()
+	{
+		$config = new LoggerConfig();
+		$config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical'];
+
+		$logger = new MockChromeHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
+		$data = new \stdClass();
+		$data->code = 123;
+		$data->explanation = "That's no moon, it's a pumpkin";
+		$result = $logger->setDateFormat('F j, Y');
+		
+		$logger->handle('debug',$data);
+		$peek = $logger->peekaboo();
+				
+		$this->assertEquals($data->explanation, $peek[0]['explanation']);
+	}
+
 }
diff --git a/tests/system/Log/FileHandlerTest.php b/tests/system/Log/FileHandlerTest.php
index 01808fa13e..f93c289170 100644
--- a/tests/system/Log/FileHandlerTest.php
+++ b/tests/system/Log/FileHandlerTest.php
@@ -33,25 +33,11 @@ class FileHandlerTest extends \CIUnitTestCase
 		$config = new LoggerConfig();
 		$config->path = $this->start . 'charlie/';
 		$config->handlers['Tests\Support\Log\Handlers\TestHandler']['handles'] = ['critical'];
-		$logger = new TestHandler($config->handlers['Tests\Support\Log\Handlers\TestHandler']);
+		$logger = new MockFileHandler($config->handlers['Tests\Support\Log\Handlers\TestHandler']);
 		$logger->setDateFormat("Y-m-d H:i:s:u");
 		$this->assertTrue($logger->handle("warning", "This is a test log"));
 	}
 
-	public function testHandleExpectedFile()
-	{
-		$config = new LoggerConfig();
-		$config->path = $this->start . 'charlie/';
-		$logger = new MockFileHandler((array) $config);
-
-		$logger->setDateFormat("Y-m-d H:i:s:u");
-		$logger->handle("warning", "This is a test log");
-
-		//are we in agreement re destination of log file?
-		$expected = 'log-' . date('Y-m-d') . '.php';
-		$this->assertEquals($config->path . $expected, $logger->destination);
-	}
-
 	public function testHandleCreateFile()
 	{
 		$config = new LoggerConfig();