diff --git a/tests/unit/e_jsmanagerTest.php b/tests/unit/e_jsmanagerTest.php
index 042645a9b..fa4da1f1a 100644
--- a/tests/unit/e_jsmanagerTest.php
+++ b/tests/unit/e_jsmanagerTest.php
@@ -43,9 +43,9 @@
 		{
 			$result = $this->js->isInAdmin();
 			$this->assertFalse($result);
-			
+
 		}
-/*
+
 		public function testRequireCoreLib()
 		{
 
@@ -251,6 +251,6 @@
 
 		}
 
-	*/
+
 
 	}
diff --git a/tests/unit/e_userTest.php b/tests/unit/e_userTest.php
index 283679a91..e6bee5b13 100644
--- a/tests/unit/e_userTest.php
+++ b/tests/unit/e_userTest.php
@@ -26,7 +26,7 @@
 			}
 		}
 
-/*
+
 
 		public function testIsCurrent()
 		{
@@ -121,5 +121,5 @@
 		public function testHasSessionError()
 		{
 
-		}*/
+		}
 	}
diff --git a/tests/unit/e_user_modelTest.php b/tests/unit/e_user_modelTest.php
new file mode 100644
index 000000000..9566068ec
--- /dev/null
+++ b/tests/unit/e_user_modelTest.php
@@ -0,0 +1,376 @@
+<?php
+	/**
+	 * e107 website system
+	 *
+	 * Copyright (C) 2008-2019 e107 Inc (e107.org)
+	 * Released under the terms and conditions of the
+	 * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+	 *
+	 */
+
+
+	class e_user_modelTest extends \Codeception\Test\Unit
+	{
+
+		/** @var e_user_model */
+		protected $usr;
+
+		protected function _before()
+		{
+
+			try
+			{
+				$this->usr = $this->make('e_user_model');
+			}
+			catch(Exception $e)
+			{
+				$this->assertTrue(false, "Couldn't load e_user_model object");
+			}
+
+			$this->usr->load(1); // load user_id  = 1.
+
+		}
+
+		public function testSave()
+		{
+
+		}
+
+		public function testGetAdminEmail()
+		{
+
+		}
+
+		public function testGetClassList()
+		{
+			$result = $this->usr->getClassList();
+			$expected = array ( 0 => 253, 1 => 254, 2 => 250, 3 => 251, 4 => 0,);
+			$this->assertEquals($expected, $result);
+
+			$result = $this->usr->getClassList(true);
+			$expected = "253,254,250,251,0";
+			$this->assertEquals($expected, $result);
+
+		}
+
+		public function testIsNewUser()
+		{
+
+		}
+
+		public function testGetCore()
+		{
+
+		}
+
+		public function testGetEditor()
+		{
+
+		}
+
+		public function testDestroy()
+		{
+
+		}
+
+		public function testRemoveClass()
+		{
+
+		}
+
+		public function testGetAdminName()
+		{
+
+		}
+
+		public function testCheckToken()
+		{
+
+		}
+
+		public function testFindPref()
+		{
+
+		}
+
+		public function testLoad()
+		{
+
+		}
+
+		public function testGetAdminId()
+		{
+
+		}
+
+		public function testSaveDebug()
+		{
+
+		}
+
+		public function testSetCore()
+		{
+
+		}
+
+		public function testHasRestriction()
+		{
+
+		}
+
+		public function testGetExtendedFront()
+		{
+
+		}
+
+		public function testGetTimezone()
+		{
+
+		}
+
+		public function testIsExtendedField()
+		{
+
+		}
+
+		public function testSetPrefData()
+		{
+
+		}
+
+		public function testIsAdmin()
+		{
+
+		}
+
+		public function testIsCurrent()
+		{
+
+		}
+
+		public function testIsWritable()
+		{
+
+		}
+
+		public function testGetName()
+		{
+			$result = $this->usr->getName();
+			$this->assertEquals('e107', $result);
+		}
+
+		public function testGetAdminPerms()
+		{
+
+		}
+
+		public function testIsCoreField()
+		{
+
+		}
+
+		public function testHasProviderName()
+		{
+
+		}
+
+		public function testMergePostedData()
+		{
+
+		}
+
+		public function testGetDisplayName()
+		{
+
+		}
+
+		public function testGetClassRegex()
+		{
+
+		}
+
+		public function testIsGuest()
+		{
+
+		}
+
+		public function testGetAdminPwchange()
+		{
+
+		}
+
+		public function testSetEditor()
+		{
+
+		}
+
+		public function testGetUserData()
+		{
+
+		}
+
+		public function testSetPref()
+		{
+
+		}
+
+		public function testAddClass()
+		{
+
+		}
+
+		public function testHasEditor()
+		{
+
+		}
+
+		public function testGetConfig()
+		{
+
+		}
+
+		public function testIsReadable()
+		{
+
+		}
+
+		public function testGetValue()
+		{
+
+		}
+
+		public function testGetToken()
+		{
+
+		}
+
+		public function testGetExtendedModel()
+		{
+
+		}
+
+		public function testRandomKey()
+		{
+
+		}
+
+		public function testGetSignatureValue()
+		{
+
+		}
+
+		public function testGetId()
+		{
+
+		}
+
+		public function testSetConfig()
+		{
+
+		}
+
+		public function testGetPref()
+		{
+
+		}
+
+		public function testGetRealName()
+		{
+
+		}
+
+		public function testCheckClass()
+		{
+
+		}
+
+		public function testHasBan()
+		{
+
+		}
+
+		public function testSetSystem()
+		{
+
+		}
+
+		public function testCheckAdminPerms()
+		{
+
+		}
+
+		public function testCheckEditorPerms()
+		{
+
+		}
+
+		public function test__construct()
+		{
+
+		}
+
+		public function testIsUser()
+		{
+
+		}
+
+		public function testSetValue()
+		{
+
+		}
+
+		public function testSetSignatureValue()
+		{
+
+		}
+
+		public function testGetProviderName()
+		{
+
+		}
+
+		public function testSetExtendedModel()
+		{
+
+		}
+
+		public function testSetExtendedFront()
+		{
+
+		}
+
+		public function testGetExtended()
+		{
+
+		}
+
+		public function testGetLoginName()
+		{
+
+		}
+
+		public function testIsBot()
+		{
+			$result = $this->usr->isBot();
+			$this->assertFalse($result);
+		}
+
+		public function testSetExtended()
+		{
+
+		}
+
+		public function testGetSystem()
+		{
+
+		}
+
+		public function testIsMainAdmin()
+		{
+
+		}
+
+
+
+
+	}