diff --git a/tests/UnitTests/CacheResourceTests/File/CacheResourceFileTest.php b/tests/UnitTests/CacheResourceTests/File/CacheResourceFileTest.php
index 56a1a49c..0205edbb 100644
--- a/tests/UnitTests/CacheResourceTests/File/CacheResourceFileTest.php
+++ b/tests/UnitTests/CacheResourceTests/File/CacheResourceFileTest.php
@@ -107,7 +107,7 @@ class CacheResourceFileTest extends CacheResourceTestCommon
         $this->smarty->caching = true;
         $this->smarty->cache_lifetime = 1000;
         $this->cleanCacheDir();
-        $this->smarty->setUseSubDirs(false);
+        $this->smarty->setUseSubDirs(true);
         $tpl = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar', 'blar');
         $this->writeCachedContent($tpl);
         $tpl2 = $this->smarty->createTemplate('helloworld.tpl', 'foo|bar2', 'blar');
diff --git a/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php b/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php
index 99711a77..b14eab67 100644
--- a/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/BockExtend/CompileBlockExtendsTest.php
@@ -1371,4 +1371,8 @@ class CompileBlockExtendsTest extends PHPUnit_Smarty
         );
     }
 
+	public function testBlockWithAssign() {
+		$this->assertEquals('Captured content is: Content with lots of html here', $this->smarty->fetch('038_child.tpl'));
+	}
+
 }
diff --git a/tests/UnitTests/TemplateSource/TagTests/BockExtend/templates/038_child.tpl b/tests/UnitTests/TemplateSource/TagTests/BockExtend/templates/038_child.tpl
new file mode 100644
index 00000000..86132ef2
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BockExtend/templates/038_child.tpl
@@ -0,0 +1,2 @@
+{extends file='038_parent.tpl'}
+{block name=content assign=content}Content with lots of html here{/block}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BockExtend/templates/038_parent.tpl b/tests/UnitTests/TemplateSource/TagTests/BockExtend/templates/038_parent.tpl
new file mode 100644
index 00000000..f00073af
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BockExtend/templates/038_parent.tpl
@@ -0,0 +1 @@
+{block name=content}{/block}Captured content is: {$content}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/ValueTests/Operators/OperatorsTest.php b/tests/UnitTests/TemplateSource/ValueTests/Operators/OperatorsTest.php
new file mode 100644
index 00000000..ea88e4bd
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/ValueTests/Operators/OperatorsTest.php
@@ -0,0 +1,23 @@
+<?php
+
+class OperatorsTest extends PHPUnit_Smarty {
+	public function setUp(): void
+	{
+		$this->setUpSmarty(__DIR__);
+	}
+
+	public function testInit()
+	{
+		$this->cleanDirs();
+	}
+
+	/**
+	 * @group issue861
+	 */
+	public function testTernaries() {
+		$this->assertEquals('2 equals 2', $this->smarty->fetch("string:{(2 === 2) ? '2 equals 2' : '2 ain\'t 2'}"));
+		$this->assertEquals('3 equals 3', $this->smarty->fetch("string:{(3 == 3) ? '3 equals 3' : '3 ain\'t 3'}"));
+		$this->assertEquals('4 equals 4', $this->smarty->fetch("string:{(4 !== 4) ? '4 ain\'t 4' : '4 equals 4'}"));
+	}
+
+}
\ No newline at end of file