diff --git a/common/constants.php b/common/constants.php
index 06f4e1810..1fc6bc64a 100644
--- a/common/constants.php
+++ b/common/constants.php
@@ -3,7 +3,7 @@
 /**
  * RX_VERSION is the version number of the Rhymix CMS.
  */
-define('RX_VERSION', '1.8.15');
+define('RX_VERSION', '1.8.16');
 
 /**
  * RX_MICROTIME is the startup time of the current script, in microseconds since the Unix epoch.
diff --git a/modules/layout/tpl/layout_modify.html b/modules/layout/tpl/layout_modify.html
index c355355b3..8fdcc28d2 100644
--- a/modules/layout/tpl/layout_modify.html
+++ b/modules/layout/tpl/layout_modify.html
@@ -1,3 +1,3 @@
 <load target="js/layout_modify.js" />
 <include target="header.html" />
-{$content}
\ No newline at end of file
+{$content}
diff --git a/tests/unit/classes/ValidatorTest.php b/tests/unit/classes/ValidatorTest.php
index c947ccfbd..de4202704 100644
--- a/tests/unit/classes/ValidatorTest.php
+++ b/tests/unit/classes/ValidatorTest.php
@@ -4,8 +4,15 @@ class ValidatorTest extends \Codeception\TestCase\Test
 {
     public function _before()
     {
+    	$ob_level = ob_get_level();
+    	
     	$oContext = Context::getInstance();
     	$oContext->init();
+    	
+    	while (ob_get_level() > $ob_level)
+    	{
+    		ob_end_clean();
+    	}
     }
 
     public function testRequired()