diff --git a/e107_handlers/bbcode_handler.php b/e107_handlers/bbcode_handler.php
index 033f4b3910..b176a3e8c0 100644
--- a/e107_handlers/bbcode_handler.php
+++ b/e107_handlers/bbcode_handler.php
@@ -749,7 +749,7 @@ function imgToBBcode($html, $fromDB = false)
 				$cls = array();
 				foreach($tmp as $v)
 				{
-					if($v === 'img-rounded' || $v === 'rounded' || strpos($v,'bbcode') === 0 )
+					if($v === 'img-rounded' || $v === 'rounded' || (strpos($v,'bbcode') === 0 && $v !== 'bbcode-img-right' && $v !== 'bbcode-img-left' ))
 					{
 						continue;
 					}
diff --git a/e107_plugins/tinymce4/plugins/e107/parser.php b/e107_plugins/tinymce4/plugins/e107/parser.php
index 1a1eaff51f..5149195459 100644
--- a/e107_plugins/tinymce4/plugins/e107/parser.php
+++ b/e107_plugins/tinymce4/plugins/e107/parser.php
@@ -8,7 +8,7 @@
  */
 
 
-if(empty($_POST['content']) && empty($_GET['debug']) && !defined('TINYMCE_DEBUG'))
+if(empty($_POST['content']) && empty($_GET['debug']) && !defined('TINYMCE_DEBUG') && !defined('TINYMCE_UNIT_TEST'))
 {
 	header('Content-Length: 0');
 	exit;
@@ -20,7 +20,7 @@
 $_E107['no_maintenance'] = true;
 
 define('e_ADMIN_AREA', true);
-if(!defined('TINYMCE_DEBUG'))
+if(!defined('TINYMCE_DEBUG') && !defined('TINYMCE_UNIT_TEST'))
 {
 	require_once("../../../../class2.php");
 }
@@ -44,7 +44,7 @@ function __construct()
 	{
 		$html = '';
 
-		if(defined('TINYMCE_DEBUG'))
+		if(defined('TINYMCE_DEBUG') || defined('TINYMCE_UNIT_TEST'))
 		{
 			$this->gzipCompression = false;
 		}