diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php
index a0598631..a4ebfb54 100644
--- a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php
@@ -58,6 +58,46 @@ class CompileBlockPluginTest extends PHPUnit_Smarty
         $this->assertEquals('block test', $this->smarty->fetch('registered.tpl'));
     }
 
+    /**
+     * test block plugin static method
+     *
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     *
+     */
+    public function testBlockPluginRegisteredStatic()
+    {
+        $this->smarty->registerPlugin(Smarty::PLUGIN_BLOCK, 'blockpluginstatic', array('myblockclass', 'staticfunc'));
+        $this->assertEquals('static block test', $this->smarty->fetch('registered_static.tpl'));
+    }
+
+    /**
+     * test block plugin object method
+     *
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     *
+     */
+    public function testBlockPluginRegisteredMethod()
+    {
+        $object = new myblockclass();
+        $this->smarty->registerPlugin(Smarty::PLUGIN_BLOCK, 'blockpluginmethod', array($object, 'methodfunc'));
+        $this->assertEquals('method block test', $this->smarty->fetch('registered_method.tpl'));
+    }
+    /**
+     * test block plugin registered object
+     *
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     *
+     */
+    public function testBlockPluginRegisteredObject()
+    {
+        $object = new myblockclass();
+        $this->smarty->registerObject('myobject', $object, array(), true, array('objectfunc'));
+        $this->assertEquals('method block test', $this->smarty->fetch('registered_object.tpl'));
+    }
+
     /**
      * test block plugin repeat function
      *
@@ -92,6 +132,32 @@ class CompileBlockPluginTest extends PHPUnit_Smarty
     {
         $this->assertEquals('default', $this->smarty->fetch('nooutput.tpl'));
     }
+    /**
+     * test nested block plugin
+     *
+     */
+    public function testBlockPluginNested()
+    {
+        $this->assertEquals('hello world12345', $this->smarty->fetch('nested.tpl'));
+    }
+    /**
+     * test default block plugin
+     *
+     */
+    public function testBlockPluginDefault1()
+    {
+        $this->smarty->registerDefaultPluginHandler('my_block_plugin_handler');
+        $this->assertEquals('scriptblock hello world', $this->smarty->fetch('default1.tpl'));
+    }
+    /**
+     * test default block plugin
+     *
+     */
+    public function testBlockPluginDefault2()
+    {
+        $this->smarty->registerDefaultPluginHandler('my_block_plugin_handler');
+        $this->assertEquals('defaultblock hello world', $this->smarty->fetch('default2.tpl'));
+    }
 }
 
 function myblockplugintest($params, $content, &$smarty_tpl, &$repeat)
@@ -102,3 +168,48 @@ function myblockplugintest($params, $content, &$smarty_tpl, &$repeat)
         return $output;
     }
 }
+
+class myblockclass
+{
+    static function staticfunc($params, $content, &$smarty_tpl, &$repeat)
+    {
+        if (!$repeat) {
+            $output = str_replace('hello world', 'static block test', $content);
+            return $output;
+        }
+    }
+    public function methodfunc($params, $content, &$smarty_tpl, &$repeat)
+    {
+        if (!$repeat) {
+            $output = str_replace('hello world', 'method block test', $content);
+            return $output;
+        }
+    }
+    public function objectfunc($params, $content, &$smarty_tpl, &$repeat)
+    {
+        if (!$repeat) {
+            $output = str_replace('hello world', 'object block test', $content);
+            return $output;
+        }
+    }
+}
+function my_block_plugin_handler($tag, $type, $template, &$callback, &$script, &$cachable)
+{
+    switch ($type) {
+        case Smarty::PLUGIN_BLOCK:
+            switch ($tag) {
+                case 'scriptblock':
+                    $script = './scripts/script_block_tag.php';
+                    $callback = 'default_script_block_tag';
+
+                    return true;
+                default:
+                    $script = './scripts/other_block_tag.php';
+                    $callback = 'default_block_tag';
+                    return true;
+            }
+         default:
+            return false;
+    }
+}
+
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/scripts/other_block_tag.php b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/scripts/other_block_tag.php
new file mode 100644
index 00000000..29cf94b4
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/scripts/other_block_tag.php
@@ -0,0 +1,7 @@
+<?php
+function default_block_tag($params, $content, $template, &$repeat)
+{
+    if (isset($content)) {
+        return 'defaultblock ' . $content;
+    }
+}
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/scripts/script_block_tag.php b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/scripts/script_block_tag.php
new file mode 100644
index 00000000..a61f14d6
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/scripts/script_block_tag.php
@@ -0,0 +1,7 @@
+<?php
+function default_script_block_tag($params, $content, $template, &$repeat)
+{
+    if (isset($content)) {
+        return 'scriptblock ' . $content;
+    }
+}
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/default1.tpl b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/default1.tpl
new file mode 100644
index 00000000..e4c3aa88
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/default1.tpl
@@ -0,0 +1 @@
+{scriptblock}hello world{/scriptblock}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/default2.tpl b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/default2.tpl
new file mode 100644
index 00000000..63e069f1
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/default2.tpl
@@ -0,0 +1 @@
+{foo}hello world{/foo}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/nested.tpl b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/nested.tpl
new file mode 100644
index 00000000..ab13b77b
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/nested.tpl
@@ -0,0 +1 @@
+{textformat assign=foo}hello world{testblock}{/testblock}{/textformat}{$foo}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/registered_method.tpl b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/registered_method.tpl
new file mode 100644
index 00000000..e0bdfaee
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/registered_method.tpl
@@ -0,0 +1 @@
+{blockpluginobject}hello world{/blockpluginobject}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/registered_object.tpl b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/registered_object.tpl
new file mode 100644
index 00000000..8de8a168
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/registered_object.tpl
@@ -0,0 +1 @@
+{myobject->objectfunc}hello world{/myobject->objectfunc}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/registered_static.tpl b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/registered_static.tpl
new file mode 100644
index 00000000..b9d83c83
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/registered_static.tpl
@@ -0,0 +1 @@
+{blockpluginstatic}hello world{/blockpluginstatic}
\ No newline at end of file