diff --git a/codeception.yml b/codeception.sample.yml
similarity index 100%
rename from codeception.yml
rename to codeception.sample.yml
diff --git a/tests/unit/XMLParseTest.php b/tests/unit/XMLParseTest.php
index 30af49eda..3276e5608 100644
--- a/tests/unit/XMLParseTest.php
+++ b/tests/unit/XMLParseTest.php
@@ -17,6 +17,6 @@
 		//	$config = e_CORE."xml/default_install.xml";
 		//	$ret = e107::getXml()->e107Import($config, 'replace', true, true); // Add core pref values
 
-			$this->assertTrue(true);
+			$this->assertTrue(true); // doing nothing right now.
 		}
 	}
diff --git a/tests/unit/e_dateTest.php b/tests/unit/e_dateTest.php
new file mode 100644
index 000000000..ace91a881
--- /dev/null
+++ b/tests/unit/e_dateTest.php
@@ -0,0 +1,137 @@
+<?php
+	/**
+	 * e107 website system
+	 *
+	 * Copyright (C) 2008-2018 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_dateTest extends \Codeception\Test\Unit
+	{
+
+		protected $dateObj;
+
+		protected function _before()
+		{
+			try
+			{
+				$this->dateObj = $this->make('e_date');
+			}
+			catch (Exception $e)
+			{
+				$this->fail("Couldn't load e_date object");
+			}
+
+		}
+
+
+		public function testToMask()
+		{
+
+			$array = array(
+
+			'%Y'	=> 'yyyy',	// jquery-ui docs say 'yy' but yy produces '13' instead of '2013'
+			'%d'	=> 'dd',
+			'%m'	=> 'mm',
+			'%B'	=> 'MM', 	// Full month name, based on the locale
+			'%A'	=> 'DD', 	// A full textual representation of the day
+
+			'%I'	=> 'HH',	// Two digit representation of the hour in 12-hour format
+			'%H'	=> 'hh',	// 24 hour format - leading zero
+			'%y'	=> 'yy',
+			'%M'	=> 'ii',	// Two digit representation of the minute
+			'%S'	=> 'ss',	// Two digit representation of the second
+
+			'%a'	=> 'D', 	// An abbreviated textual representation of the day
+			'%b'	=> 'M', 	// Abbreviated month name, based on the locale
+			'%h'	=> 'M', 	// Abbreviated month name, based on the locale (an alias of %b)
+
+			'%l'	=> 'H',		// 12 hour format - no leading zero
+
+
+
+			'%p'	=> 'P',	//	%p	UPPER-CASE 'AM' or 'PM' based on the given time
+			'%P'	=> 'p',		// %P	lower-case 'am' or 'pm' based on the given time
+
+
+	//		'%T' 	=> 'hh:mm:ss',
+	//		'%r' 	=> "hh:mmm:ss TT" // 12 hour format
+			);
+
+
+			$keys = array_keys($array);
+		//	$values = array_values($array);
+
+			$old = implode(" ",$keys);
+
+
+			$new = $this->dateObj->toMask($old);
+
+			$expected = "yyyy dd mm MM DD HH hh yy ii ss D M M H P p";
+			$this->assertEquals($expected,$new);
+
+
+			$expected = "%Y %d %m %B %A %I %H %y %M %S %a %b %b %l %p %P";
+			$actual = $this->dateObj->toMask($new, true);
+
+			$this->assertEquals($expected,$actual);
+
+
+		//	$this->fail('end');
+		}
+
+		public function testSupported()
+		{
+			$this->dateObj->supported(); // dumps info
+		}
+
+		public function testIsValidTimezone()
+		{
+
+		}
+
+		public function testBuildDateLocale()
+		{
+
+		}
+
+		public function testToTime()
+		{
+
+		}
+
+		public function testDecodeDateTime()
+		{
+
+		}
+
+		public function testComputeLapse()
+		{
+
+		}
+
+		public function testStrptime()
+		{
+
+		}
+
+		public function testConvert_date()
+		{
+
+		}
+
+		public function testTerms()
+		{
+
+			$data = $this->dateObj->terms();
+
+			$result = ($data[1] === 'January' && $data[12] === 'December') ? true : false;
+
+			$this->assertTrue($result);
+
+		//	$this->fail(print_r($result,true));
+		}
+	}