diff --git a/tests/unit/e107pluginTest.php b/tests/unit/e107pluginTest.php
index 66025facb..364a0ee4b 100644
--- a/tests/unit/e107pluginTest.php
+++ b/tests/unit/e107pluginTest.php
@@ -23,7 +23,7 @@
 			}
 			catch (Exception $e)
 			{
-				$this->assertTrue(false, "Couldn't e107_plugi object");
+				$this->assertTrue(false, "Couldn't e107_plugin object");
 			}
 
 		}
diff --git a/tests/unit/e_sessionTest.php b/tests/unit/e_sessionTest.php
index 7228e89dc..8233ea284 100644
--- a/tests/unit/e_sessionTest.php
+++ b/tests/unit/e_sessionTest.php
@@ -11,12 +11,44 @@
 
 	class e_sessionTest extends \Codeception\Test\Unit
 	{
-/*
-		public function testSetOption()
+		/** @var e_session  */
+		private $sess;
+
+		protected function _before()
 		{
+			try
+			{
+				$this->sess = $this->make('e_session');
+			}
+			catch (Exception $e)
+			{
+				$this->assertTrue(false, "Couldn't load e_session object");
+			}
 
 		}
 
+		public function testSetOption()
+		{
+			$opt = array(
+				'lifetime'	 => 3600 ,
+				'path'		 => '/',
+				'domain'	 => 'test.com',
+				'secure'	 => false,
+				'httponly'	 => true,
+				'_dummy'    => 'not here'
+			);
+
+			$this->sess->setOptions($opt);
+
+			$newOpt = $this->sess->getOptions();
+
+			unset($opt['_dummy']);
+
+			$this->assertEquals($opt,$newOpt);
+
+
+		}
+/*
 		public function testGetOption()
 		{
 
diff --git a/tests/unit/themeHandlerTest.php b/tests/unit/themeHandlerTest.php
new file mode 100644
index 000000000..60a84309f
--- /dev/null
+++ b/tests/unit/themeHandlerTest.php
@@ -0,0 +1,194 @@
+<?php
+	/**
+	 * Created by PhpStorm.
+	 * Date: 2/7/2019
+	 * Time: 5:03 PM
+	 */
+
+
+	class themeHandlerTest extends \Codeception\Test\Unit
+	{
+
+		/** @var themeHandler */
+		protected $th;
+
+		protected function _before()
+		{
+
+			try
+			{
+				$this->th = $this->make('themeHandler');
+			}
+			catch(Exception $e)
+			{
+				$this->assertTrue(false, "Couldn't load themeHandler object");
+			}
+
+		}
+
+
+
+		public function testSetThemeConfig()
+		{
+
+		}
+/*
+		public function testTheme_adminlog()
+		{
+
+		}
+
+		public function testPostObserver()
+		{
+
+		}
+
+		public function testInstallContent()
+		{
+
+		}
+
+		public function testRenderTheme()
+		{
+
+		}
+
+		public function testSetAdminStyle()
+		{
+
+		}
+
+		public function testRenderThemeInfo()
+		{
+
+		}
+
+		public function testRenderUploadForm()
+		{
+
+		}
+
+		public function testFindDefault()
+		{
+
+		}
+
+		public function testGetThemes()
+		{
+
+		}
+
+		public function testRenderOnline()
+		{
+
+		}
+
+		public function testShowThemes()
+		{
+
+		}
+
+		public function testSetLayouts()
+		{
+
+		}
+
+		public function testRenderThemeConfig()
+		{
+
+		}
+
+		public function testGetThemeCategory()
+		{
+
+		}
+
+		public function testShowPreview()
+		{
+
+		}
+
+		public function testLoadThemeConfig()
+		{
+
+		}
+
+		public function testParse_theme_php()
+		{
+
+		}
+
+		public function testRenderThemeHelp()
+		{
+
+		}
+
+		public function testSetAdminTheme()
+		{
+
+		}
+
+		public function testRefreshPage()
+		{
+
+		}
+
+		public function testParse_theme_xml()
+		{
+
+		}
+
+		public function testThemeUpload()
+		{
+
+		}
+
+		public function testInstallContentCheck()
+		{
+
+		}
+
+		public function testSetStyle()
+		{
+
+		}
+
+		public function testGetMarketplace()
+		{
+
+		}
+
+		public function testRenderPresets()
+		{
+
+		}
+
+		public function testRenderPlugins()
+		{
+
+		}
+
+		public function testThemePreview()
+		{
+
+		}
+
+		public function testSetCustomPages()
+		{
+
+		}
+
+		public function testGetThemeInfo()
+		{
+
+		}
+
+		public function testSetTheme()
+		{
+
+		}
+
+	*/
+
+
+	}