diff --git a/plugins/baser-core/src/BcPlugin.php b/plugins/baser-core/src/BcPlugin.php
index 9560e58a1c..dcc449b98c 100644
--- a/plugins/baser-core/src/BcPlugin.php
+++ b/plugins/baser-core/src/BcPlugin.php
@@ -466,6 +466,7 @@ public function routes(RouteBuilder $routes): void
      * @return RouteBuilder
      * @checked
      * @noTodo
+     * @unitTest
      */
     public function contentsRoutingForReverse(RouteBuilder $routes, string $plugin)
     {
@@ -494,6 +495,7 @@ function(RouteBuilder $routes) {
      * @return RouteBuilder
      * @checked
      * @noTodo
+     * @unitTest
      */
     public function frontPageRouting(RouteBuilder $routes, string $plugin)
     {
diff --git a/plugins/baser-core/src/Event/BcEventListener.php b/plugins/baser-core/src/Event/BcEventListener.php
index 355b454a40..7d1c3d7863 100644
--- a/plugins/baser-core/src/Event/BcEventListener.php
+++ b/plugins/baser-core/src/Event/BcEventListener.php
@@ -64,6 +64,7 @@ class BcEventListener implements EventListenerInterface
      * コンストラクタ
      * @checked
      * @noTodo
+     * @unitTest
      */
     public function __construct()
     {
@@ -78,6 +79,7 @@ public function __construct()
      * @return array
      * @checked
      * @noTodo
+     * @unitTest
      */
     public function implementedEvents(): array
     {
diff --git a/plugins/baser-core/src/Event/BcShortCodeEventListener.php b/plugins/baser-core/src/Event/BcShortCodeEventListener.php
index 97efbd65e2..8cbd21144c 100644
--- a/plugins/baser-core/src/Event/BcShortCodeEventListener.php
+++ b/plugins/baser-core/src/Event/BcShortCodeEventListener.php
@@ -50,6 +50,7 @@ public function implementedEvents(): array
      * @return void
      * @checked
      * @noTodo
+     * @unitTest
      */
     public function afterRender(Event $event)
     {
@@ -65,6 +66,7 @@ public function afterRender(Event $event)
      * @return void
      * @checked
      * @noTodo
+     * @unitTest
      */
     protected function _execShortCode(View $view)
     {
diff --git a/plugins/baser-core/src/Mailer/BcMailer.php b/plugins/baser-core/src/Mailer/BcMailer.php
index 59385a1fa0..89672a265b 100644
--- a/plugins/baser-core/src/Mailer/BcMailer.php
+++ b/plugins/baser-core/src/Mailer/BcMailer.php
@@ -59,9 +59,13 @@ public function __construct($config = null)
         if ($site) $this->viewBuilder()
             ->setTheme($site->theme)
             ->setClassName('BaserCore.BcFrontEmail');
-        $this->setFrom([
-            BcSiteConfig::get('email') => BcSiteConfig::get('formal_name')
-        ]);
+        $adminMail = BcSiteConfig::get('email');
+        if (strpos($adminMail, ',') !== false) {
+            [$fromAdmin] = explode(',', $adminMail);
+        } else {
+            $fromAdmin = $adminMail;
+        }
+        $this->setFrom($fromAdmin, BcSiteConfig::get('formal_name'));
     }
 
     /**
diff --git a/plugins/baser-core/src/Middleware/BcFrontMiddleware.php b/plugins/baser-core/src/Middleware/BcFrontMiddleware.php
index 3a819f78b9..84b6d5f131 100644
--- a/plugins/baser-core/src/Middleware/BcFrontMiddleware.php
+++ b/plugins/baser-core/src/Middleware/BcFrontMiddleware.php
@@ -36,6 +36,7 @@ class BcFrontMiddleware implements MiddlewareInterface
      * @return ResponseInterface
      * @checked
      * @noTodo
+     * @unitTest
      */
     public function process(
         ServerRequestInterface  $request,
diff --git a/plugins/baser-core/src/Model/Table/SiteConfigsTable.php b/plugins/baser-core/src/Model/Table/SiteConfigsTable.php
index 01b5202d74..615fab96fd 100755
--- a/plugins/baser-core/src/Model/Table/SiteConfigsTable.php
+++ b/plugins/baser-core/src/Model/Table/SiteConfigsTable.php
@@ -79,8 +79,12 @@ public function validationKeyValue(Validator $validator): Validator
     {
         $validator
             ->scalar('email')
-            ->email('email', 255, __d('baser_core', '管理者メールアドレスの形式が不正です。'))
-            ->notEmptyString('email', __d('baser_core', '管理者メールアドレスを入力してください。'));
+            ->notEmptyString('email', __d('baser_core', '管理者メールアドレスを入力してください。'))
+            ->add('email', ['emails' => [
+                'rule' => 'emails',
+                'provider' => 'bc',
+                'message' => __d('baser_core', '管理者メールアドレスの形式が不正です。')
+            ]]);
         $validator
             ->scalar('site_url')
             ->regex('site_url', '/^(http|https):/', __d('baser_core', 'WebサイトURLはURLの形式を入力してください。'))
diff --git a/plugins/baser-core/src/Service/Admin/BcAdminContentsService.php b/plugins/baser-core/src/Service/Admin/BcAdminContentsService.php
index 8513b44ebb..5a632f5fc6 100644
--- a/plugins/baser-core/src/Service/Admin/BcAdminContentsService.php
+++ b/plugins/baser-core/src/Service/Admin/BcAdminContentsService.php
@@ -133,7 +133,7 @@ public function getLayoutTemplates(EntityInterface $content)
             if (in_array($parentTemplate, $templates)) {
                 unset($templates[$parentTemplate]);
             }
-            $templates = array_merge($templates, ['' => __d('baser_core', '親フォルダの設定に従う') . '（' . $parentTemplate . '）']);
+            $templates = array_merge(['' => __d('baser_core', '親フォルダの設定に従う') . '（' . $parentTemplate . '）'], $templates);
         }
         return $templates;
     }
diff --git a/plugins/baser-core/src/Service/BcDatabaseService.php b/plugins/baser-core/src/Service/BcDatabaseService.php
index 41a36e98af..fedc16963c 100644
--- a/plugins/baser-core/src/Service/BcDatabaseService.php
+++ b/plugins/baser-core/src/Service/BcDatabaseService.php
@@ -324,11 +324,8 @@ public function dropTable(string $tableName)
      */
     public function loadDefaultDataPattern(string $theme, string $pattern, string $dbConfigKeyName = 'default'): bool
     {
-        $plugins = array_merge(
-            ['BaserCore'],
-            Configure::read('BcApp.corePlugins'),
-            BcUtil::getCurrentThemesPlugins()
-        );
+        $folderUtility = new BcFolder(Plugin::path($theme) . 'config' . DS . 'data' . DS . $pattern);
+        $plugins = $folderUtility->getFolders();
 
 		$db = $this->getDataSource($dbConfigKeyName);
 		$db->begin();
@@ -1052,7 +1049,7 @@ public function writeSchema($table, $options)
             'schema' => $schema
         ]);
 
-        $eventManager = EventManager::instance();
+        $eventManager = new EventManager();
         $beforeRenderListeners = BcUtil::offEvent($eventManager, 'View.beforeRender');
         $afterRenderListeners = BcUtil::offEvent($eventManager, 'View.afterRender');
 
diff --git a/plugins/baser-core/src/Utility/BcUtil.php b/plugins/baser-core/src/Utility/BcUtil.php
index c48cb7623c..8da2c6a2ae 100644
--- a/plugins/baser-core/src/Utility/BcUtil.php
+++ b/plugins/baser-core/src/Utility/BcUtil.php
@@ -11,6 +11,7 @@
 
 namespace BaserCore\Utility;
 
+use BaserCore\Error\BcException;
 use BaserCore\Middleware\BcAdminMiddleware;
 use BaserCore\Middleware\BcFrontMiddleware;
 use BaserCore\Middleware\BcRequestFilterMiddleware;
@@ -1641,6 +1642,13 @@ public static function fgetcsvReg(&$handle, $length = null, $d = ',', $e = '"')
      */
     public static function offEvent(EventManagerInterface $eventManager, string $eventKey)
     {
+        $reflection = new ReflectionClass($eventManager);
+        $property = $reflection->getProperty('_isGlobal');
+        $property->setAccessible(true);
+        if($property->getValue($eventManager)) {
+            throw new BcException(__d('baser_core', 'グローバルイベントマネージャーからはイベントをオフにすることはできません。'));
+        }
+
         $globalEventManager = $eventManager->instance();
         $eventListeners = [
             'local' => $eventManager->prioritisedListeners($eventKey),
@@ -1674,6 +1682,13 @@ public static function offEvent(EventManagerInterface $eventManager, string $eve
      */
     public static function onEvent(EventManagerInterface $eventManager, string $eventKey, array $eventListeners)
     {
+        $reflection = new ReflectionClass($eventManager);
+        $property = $reflection->getProperty('_isGlobal');
+        $property->setAccessible(true);
+        if($property->getValue($eventManager)) {
+            throw new BcException(__d('baser_core', 'グローバルイベントマネージャーからはイベントをオンにすることはできません。'));
+        }
+
         $globalEventManager = $eventManager->instance();
         if (!empty($eventListeners['local'])) {
             foreach($eventListeners['local'] as $priority => $listeners) {
diff --git a/plugins/baser-core/tests/TestCase/BcPluginTest.php b/plugins/baser-core/tests/TestCase/BcPluginTest.php
index 34218a84b2..bf637057f2 100644
--- a/plugins/baser-core/tests/TestCase/BcPluginTest.php
+++ b/plugins/baser-core/tests/TestCase/BcPluginTest.php
@@ -576,6 +576,24 @@ public function test_applyAsTheme()
         $this->assertEquals($updateTheme, $site->theme);
     }
 
+    /**
+     * test frontPageRouting
+     */
+    public function testFrontPageRouting()
+    {
+        // 管理画面のプラグイン用ルーティング
+        $result = Router::parseRequest($this->getRequest('/baser/admin/bc-blog/blog_contents/index'));
+        $this->assertEquals('BlogContents', $result['controller']);
+        $result = Router::parseRequest($this->getRequest('/baser/admin/bc-blog/blog_contents/edit/1'));
+        $this->assertEquals('BlogContents', $result['controller']);
+
+        // フロントエンドのプラグイン用ルーティング
+        $result = Router::parseRequest($this->getRequest('/bc-blog/blog_contents/index'));
+        $this->assertEquals('BlogContents', $result['controller']);
+        $result = Router::parseRequest($this->getRequest('/bc-blog/blog_contents/edit/1'));
+        $this->assertEquals('BlogContents', $result['controller']);
+    }
+
     /**
      * test Rest API
      */
@@ -646,4 +664,24 @@ public function testRestApi()
         $this->assertEquals(0, count($result->pages));
     }
 
+    /**
+     * test contentsRoutingForReverse
+     */
+    public function testContentsRoutingForReverse()
+    {
+        SiteFactory::make(['id' => '1', 'main_site_id' => null])->persist();
+        SiteFactory::make(['id' => '2', 'main_site_id' => 1, 'alias' => 's'])->persist();
+        ContentFactory::make(['plugin' => 'BcBlog', 'type' => 'BlogContent', 'entity_id' => 31, 'url' => '/news/', 'site_id' => 1])->persist();
+        $this->BcPlugin = new BcPlugin(['name' => 'BcBlog']);
+        $routes = Router::createRouteBuilder('/');
+        $this->BcPlugin->routes($routes);
+        $this->getRequest('/');
+        $this->assertEquals('/news/', Router::url([
+            'plugin' => 'BcBlog',
+            'controller' => 'Blog',
+            'action' => 'index',
+            'entityId' => 31
+        ]));
+    }
+
 }
diff --git a/plugins/baser-core/tests/TestCase/Event/BcEventListenerTest.php b/plugins/baser-core/tests/TestCase/Event/BcEventListenerTest.php
index 3fdebf0398..ea0b7af4e7 100644
--- a/plugins/baser-core/tests/TestCase/Event/BcEventListenerTest.php
+++ b/plugins/baser-core/tests/TestCase/Event/BcEventListenerTest.php
@@ -20,6 +20,19 @@ public function tearDown(): void
         parent::tearDown();
     }
 
+    /**
+     * test __construct
+     */
+    public function test__construct()
+    {
+        $this->BcEventListener = $this->getMockBuilder(BcEventListener::class)
+            ->onlyMethods(['getAction'])
+            ->setMockClassName('TestAction')
+            ->getMock();
+
+        $this->assertEquals('TestAction', $this->BcEventListener->plugin);
+    }
+
     /**
      * Test getAction
      *
@@ -80,4 +93,15 @@ public static function isActionDataProvider()
             ['Users.Index', 'Users.Index', true, true],
         ];
     }
+
+
+    /**
+     * test implementedEvents
+     */
+    public function testImplementedEvents()
+    {
+        $this->BcEventListener->events = ['isAction' => ['priority' => 100]];
+        $rs = $this->BcEventListener->implementedEvents();
+        $this->assertNotEmpty($rs);
+    }
 }
diff --git a/plugins/baser-core/tests/TestCase/Event/BcShortCodeEventListenerTest.php b/plugins/baser-core/tests/TestCase/Event/BcShortCodeEventListenerTest.php
index 667183dd9e..4fe21e662e 100644
--- a/plugins/baser-core/tests/TestCase/Event/BcShortCodeEventListenerTest.php
+++ b/plugins/baser-core/tests/TestCase/Event/BcShortCodeEventListenerTest.php
@@ -4,9 +4,16 @@
 
 use BaserCore\Event\BcShortCodeEventListener;
 use BaserCore\TestSuite\BcTestCase;
+use BaserCore\View\BcFrontAppView;
+use Cake\Event\Event;
 
 class BcShortCodeEventListenerTest extends BcTestCase
 {
+    /**
+     * @var BcShortCodeEventListener
+     */
+    protected $BcShortCodeEventListener;
+
     public function setUp(): void
     {
         parent::setUp();
@@ -26,4 +33,34 @@ public function testImplementedEvents()
         $this->assertTrue(is_array($this->BcShortCodeEventListener->implementedEvents()));
     }
 
+    /**
+     * test afterRender
+     */
+    public function testAfterRender()
+    {
+        //準備
+        $view = new BcFrontAppView($this->getRequest('/'));
+        $view->loadHelper('BcBaser', ['className' => 'BaserCore.BcBaser']);
+        $view->assign('content', '[BcBaser.getSitemap]');
+        $event = new Event('afterRender', $view);
+        //テストを実行
+        $this->BcShortCodeEventListener->afterRender($event);
+        //戻り値を確認
+        $this->assertTextContains('<ul class="menu ul-level-1">', $view->fetch('content'));
+    }
+
+    /**
+     * test _execShortCode
+     */
+    public function test_execShortCode()
+    {
+        //準備
+        $view = new BcFrontAppView($this->getRequest('/'));
+        $view->loadHelper('BcBaser', ['className' => 'BaserCore.BcBaser']);
+        $view->assign('content', '[BcBaser.getSitemap]');
+        //テストを実行
+        $this->execPrivateMethod($this->BcShortCodeEventListener, '_execShortCode', [$view]);
+        //戻り値を確認
+        $this->assertTextContains('<ul class="menu ul-level-1">', $view->fetch('content'));
+    }
 }
diff --git a/plugins/baser-core/tests/TestCase/Middleware/BcFrontMiddlewareTest.php b/plugins/baser-core/tests/TestCase/Middleware/BcFrontMiddlewareTest.php
index bb353b3439..c102ad96df 100644
--- a/plugins/baser-core/tests/TestCase/Middleware/BcFrontMiddlewareTest.php
+++ b/plugins/baser-core/tests/TestCase/Middleware/BcFrontMiddlewareTest.php
@@ -78,4 +78,32 @@ public function test_setCurrent(): void
         $this->assertNotEmpty($request->getAttribute('currentSite'));
     }
 
+    /**
+     * Test process
+     */
+    public function test_process(): void
+    {
+        ContentFactory::make([
+            'id' => 1,
+            'entity_id' => 1,
+            'url' => '/',
+            'site_id' => 1,
+            'status' => true,
+        ])->persist();
+        SiteFactory::make([
+            'id' => 1,
+            'name' => '',
+            'title' => 'baserCMS inc.',
+            'status' => true,
+        ])->persist();
+        $request = $this->getRequest()->withAttribute('isRequestView', true)->withQueryParams([
+            'Site' => SiteFactory::get(1),
+            'Content' => ContentFactory::get(1)
+        ]);
+
+        $rs = $this->execPrivateMethod($this->BcFrontMiddleware, 'setCurrent', [$request]);
+        $this->assertNotEmpty($rs->getAttribute('currentContent'));
+        $this->assertNotEmpty($rs->getAttribute('currentSite'));
+    }
+
 }
diff --git a/plugins/baser-core/tests/TestCase/Service/SiteConfigsServiceTest.php b/plugins/baser-core/tests/TestCase/Service/SiteConfigsServiceTest.php
index c91c5375aa..2c90b85601 100644
--- a/plugins/baser-core/tests/TestCase/Service/SiteConfigsServiceTest.php
+++ b/plugins/baser-core/tests/TestCase/Service/SiteConfigsServiceTest.php
@@ -25,6 +25,7 @@
 class SiteConfigsServiceTest extends \BaserCore\TestSuite\BcTestCase
 {
 
+    use EmailTrait;
     /**
      * Trait
      */
@@ -193,7 +194,7 @@ public function testSendTestMail()
 
         //異常常テスト　エラーになる
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The email set for `from` is empty.');
-        $this->SiteConfigs->sendTestMail([], '', 'メール送信テスト', 'メール送信テスト');
+        $this->expectExceptionMessage('Invalid email set for `from`. You passed `aaa`');
+        $this->SiteConfigs->sendTestMail(['email' => 'aaa'], '', 'メール送信テスト', 'メール送信テスト');
     }
 }
diff --git a/plugins/baser-core/tests/TestCase/Utility/BcUtilTest.php b/plugins/baser-core/tests/TestCase/Utility/BcUtilTest.php
index 326ad66a0c..1c8bd095de 100644
--- a/plugins/baser-core/tests/TestCase/Utility/BcUtilTest.php
+++ b/plugins/baser-core/tests/TestCase/Utility/BcUtilTest.php
@@ -1206,7 +1206,7 @@ public static function fgetcsvRegDataProvider()
      */
     public function testOnEventOffEvent(): void
     {
-        $eventManager = EventManager::instance();
+        $eventManager = new EventManager();
         $eventKey = 'testOnEvent';
         $bcEvenListener = new class extends BcEventListener {
             public $events = ['event1'];
diff --git a/plugins/bc-admin-third/templates/plugin/BcThemeConfig/Admin/ThemeConfigs/index.php b/plugins/bc-admin-third/templates/plugin/BcThemeConfig/Admin/ThemeConfigs/index.php
index 9ca47785ec..2adbb53c89 100644
--- a/plugins/bc-admin-third/templates/plugin/BcThemeConfig/Admin/ThemeConfigs/index.php
+++ b/plugins/bc-admin-third/templates/plugin/BcThemeConfig/Admin/ThemeConfigs/index.php
@@ -79,7 +79,7 @@
       <p><?php echo $this->BcAdminForm->control('logo', ['type' => 'file']) ?><?php if ($themeConfig->logo): ?><?php echo $this->BcAdminForm->control('logo_delete', ['type' => 'checkbox', 'label' => __d('baser_core', '削除する')]) ?><?php endif ?><?php echo $this->BcAdminForm->error('logo') ?></p>
       <?php echo $this->BcAdminForm->control('logo_alt', ['type' => 'text', 'size' => 50]) ?>
       <small>[<?php echo __d('baser_core', '説明文') ?>]</small><br>
-      <?php echo $this->BcAdminForm->control('logo_link', ['type' => 'text', 'size' => 50]) ?>
+      <?php echo $this->BcAdminForm->control('logo_link', ['type' => 'text', 'size' => 50]) ?><?php echo $this->BcAdminForm->error('logo_link') ?>
       <small>[<?php echo __d('baser_core', 'リンク先URL') ?>]</small>
     </td>
   </tr>
@@ -90,7 +90,7 @@
       <p><?php echo $this->BcAdminForm->control('main_image_1', ['type' => 'file']) ?><?php if ($themeConfig->main_image_1): ?><?php echo $this->BcAdminForm->control('main_image_1_delete', ['type' => 'checkbox', 'label' => __d('baser_core', '削除する')]) ?><?php endif ?><?php echo $this->BcAdminForm->error('main_image_1') ?></p>
       <?php echo $this->BcAdminForm->control('main_image_alt_1', ['type' => 'text', 'size' => 50]) ?>
       <small>[<?php echo __d('baser_core', '説明文') ?>]</small><br>
-      <?php echo $this->BcAdminForm->control('main_image_link_1', ['type' => 'text', 'size' => 50]) ?>
+      <?php echo $this->BcAdminForm->control('main_image_link_1', ['type' => 'text', 'size' => 50]) ?><?php echo $this->BcAdminForm->error('main_image_link_1') ?>
       <small>[<?php echo __d('baser_core', 'リンク先URL') ?>]</small>
     </td>
   </tr>
@@ -101,7 +101,7 @@
       <p><?php echo $this->BcAdminForm->control('main_image_2', ['type' => 'file']) ?><?php if ($themeConfig->main_image_2): ?><?php echo $this->BcAdminForm->control('main_image_2_delete', ['type' => 'checkbox', 'label' => __d('baser_core', '削除する')]) ?><?php endif ?><?php echo $this->BcAdminForm->error('main_image_2') ?></p>
       <?php echo $this->BcAdminForm->control('main_image_alt_2', ['type' => 'text', 'size' => 50]) ?>
       <small>[<?php echo __d('baser_core', '説明文') ?>]</small><br>
-      <?php echo $this->BcAdminForm->control('main_image_link_2', ['type' => 'text', 'size' => 50]) ?>
+      <?php echo $this->BcAdminForm->control('main_image_link_2', ['type' => 'text', 'size' => 50]) ?><?php echo $this->BcAdminForm->error('main_image_link_2') ?>
       <small>[<?php echo __d('baser_core', 'リンク先URL') ?>]</small>
     </td>
   </tr>
@@ -112,7 +112,7 @@
       <p><?php echo $this->BcAdminForm->control('main_image_3', ['type' => 'file']) ?><?php if ($themeConfig->main_image_3): ?><?php echo $this->BcAdminForm->control('main_image_3_delete', ['type' => 'checkbox', 'label' => __d('baser_core', '削除する')]) ?><?php endif ?><?php echo $this->BcAdminForm->error('main_image_3') ?></p>
       <?php echo $this->BcAdminForm->control('main_image_alt_3', ['type' => 'text', 'size' => 50]) ?>
       <small>[<?php echo __d('baser_core', '説明文') ?>]</small><br>
-      <?php echo $this->BcAdminForm->control('main_image_link_3', ['type' => 'text', 'size' => 50]) ?>
+      <?php echo $this->BcAdminForm->control('main_image_link_3', ['type' => 'text', 'size' => 50]) ?><?php echo $this->BcAdminForm->error('main_image_link_3') ?>
       <small>[<?php echo __d('baser_core', 'リンク先URL') ?>]</small>
     </td>
   </tr>
@@ -123,7 +123,7 @@
       <p><?php echo $this->BcAdminForm->control('main_image_4', ['type' => 'file']) ?><?php if ($themeConfig->main_image_4): ?><?php echo $this->BcAdminForm->control('main_image_4_delete', ['type' => 'checkbox', 'label' => __d('baser_core', '削除する')]) ?><?php endif ?><?php echo $this->BcAdminForm->error('main_image_4') ?></p>
       <?php echo $this->BcAdminForm->control('main_image_alt_4', ['type' => 'text', 'size' => 50]) ?>
       <small>[<?php echo __d('baser_core', '説明文') ?>]</small><br>
-      <?php echo $this->BcAdminForm->control('main_image_link_4', ['type' => 'text', 'size' => 50]) ?>
+      <?php echo $this->BcAdminForm->control('main_image_link_4', ['type' => 'text', 'size' => 50]) ?><?php echo $this->BcAdminForm->error('main_image_link_4') ?>
       <small>[<?php echo __d('baser_core', 'リンク先URL') ?>]</small>
     </td>
   </tr>
@@ -134,7 +134,7 @@
       <p><?php echo $this->BcAdminForm->control('main_image_5', ['type' => 'file']) ?><?php if ($themeConfig->main_image_5): ?><?php echo $this->BcAdminForm->control('main_image_5_delete', ['type' => 'checkbox', 'label' => __d('baser_core', '削除する')]) ?><?php endif ?><?php echo $this->BcAdminForm->error('main_image_5') ?></p>
       <?php echo $this->BcAdminForm->control('main_image_alt_5', ['type' => 'text', 'size' => 50]) ?>
       <small>[<?php echo __d('baser_core', '説明文') ?>]</small><br>
-      <?php echo $this->BcAdminForm->control('main_image_link_5', ['type' => 'text', 'size' => 50]) ?>
+      <?php echo $this->BcAdminForm->control('main_image_link_5', ['type' => 'text', 'size' => 50]) ?><?php echo $this->BcAdminForm->error('main_image_link_5') ?>
       <small>[<?php echo __d('baser_core', 'リンク先URL') ?>]</small>
     </td>
   </tr>
diff --git a/plugins/bc-blog/src/Controller/Admin/BlogContentsController.php b/plugins/bc-blog/src/Controller/Admin/BlogContentsController.php
index 667362d77a..f31e1b63b8 100755
--- a/plugins/bc-blog/src/Controller/Admin/BlogContentsController.php
+++ b/plugins/bc-blog/src/Controller/Admin/BlogContentsController.php
@@ -116,6 +116,7 @@ public function edit(BlogContentsAdminServiceInterface $service, int $id)
      * @return ResponseInterface
      * @checked
      * @noTodo
+     * @unitTest
      */
     protected function redirectEditBlog(string $template): ResponseInterface
     {
diff --git a/plugins/bc-blog/src/Mailer/BlogCommentMailer.php b/plugins/bc-blog/src/Mailer/BlogCommentMailer.php
index d03bb0d333..980e729423 100755
--- a/plugins/bc-blog/src/Mailer/BlogCommentMailer.php
+++ b/plugins/bc-blog/src/Mailer/BlogCommentMailer.php
@@ -33,20 +33,17 @@ class BlogCommentMailer extends BcMailer
      */
     public function sendCommentToAdmin(string $senderName, array $data)
     {
-        $adminMail = BcSiteConfig::get('email');
-        if (strpos($adminMail, ',') !== false) {
-            [$fromAdmin] = explode(',', $adminMail);
-        } else {
-            $fromAdmin = $adminMail;
+        $adminMail = explode(',', BcSiteConfig::get('email'));
+        $fromAdmin = $adminMail[0];
+        foreach ($adminMail as $mailTo) {
+            $this->setTo($mailTo)
+                ->setFrom($fromAdmin, $senderName)
+                ->setReplyTo($fromAdmin)
+                ->setSubject(__d('baser_core', '【{0}】コメントを受け付けました', $senderName))
+                ->viewBuilder()
+                ->setTemplate('BcBlog.blog_comment_admin')
+                ->setVars($data);
         }
-
-        $this->setTo($adminMail)
-            ->setFrom($fromAdmin, $senderName)
-            ->setReplyTo($fromAdmin)
-            ->setSubject(__d('baser_core', '【{0}】コメントを受け付けました', $senderName))
-            ->viewBuilder()
-            ->setTemplate('BcBlog.blog_comment_admin')
-            ->setVars($data);
     }
 
     /**
@@ -56,6 +53,7 @@ public function sendCommentToAdmin(string $senderName, array $data)
      * @param array $data
      * @checked
      * @noTodo
+     * @unitTest
      */
     public function sendCommentToUser(string $senderName, string $userMail, array $data)
     {
diff --git a/plugins/bc-blog/tests/TestCase/Controller/Admin/BlogContentsControllerTest.php b/plugins/bc-blog/tests/TestCase/Controller/Admin/BlogContentsControllerTest.php
index 5d9a08e520..4995f40056 100755
--- a/plugins/bc-blog/tests/TestCase/Controller/Admin/BlogContentsControllerTest.php
+++ b/plugins/bc-blog/tests/TestCase/Controller/Admin/BlogContentsControllerTest.php
@@ -177,7 +177,10 @@ public function test_redirectEditLayout()
      */
     public function test_redirectEditBlog()
     {
-        $this->markTestIncomplete('このテストは、まだ実装されていません。');
+        $controller = new BlogContentsController($this->getRequest());
+        $rs = $this->execPrivateMethod($controller, 'redirectEditBlog', ['BcColumn']);
+        $this->assertEquals('https://localhost/baser/admin/bc-theme-file/theme_files/edit/BcFront/BcBlog/etc/Blog/BcColumn/index.php', $rs->getHeader('Location')[0]);
+        $this->assertEquals(302, $rs->getStatusCode());
     }
 
 }
diff --git a/plugins/bc-blog/tests/TestCase/Mailer/BlogCommentMailerTest.php b/plugins/bc-blog/tests/TestCase/Mailer/BlogCommentMailerTest.php
index 49a64fa2ae..9400dd9aab 100644
--- a/plugins/bc-blog/tests/TestCase/Mailer/BlogCommentMailerTest.php
+++ b/plugins/bc-blog/tests/TestCase/Mailer/BlogCommentMailerTest.php
@@ -11,7 +11,7 @@ class BlogCommentMailerTest extends BcTestCase
     public function setUp(): void
     {
         parent::setUp();
-        SiteConfigFactory::make(['name' => 'email', 'value' => 'basertest@example.com'])->persist();
+        SiteConfigFactory::make(['name' => 'email', 'value' => 'basertest@example.com,basertest02@example.com'])->persist();
         $this->BlogCommentMailer = new BlogCommentMailer();
     }
 
@@ -26,7 +26,18 @@ public function tearDown(): void
     public function testSendCommentToAdmin()
     {
         $this->BlogCommentMailer->sendCommentToAdmin('test', ['test' => 'test']);
+        $this->assertEquals(['basertest02@example.com' => 'basertest02@example.com'], $this->BlogCommentMailer->getTo());
         $this->assertEquals('BcBlog.blog_comment_admin', $this->BlogCommentMailer->viewBuilder()->getTemplate());
         $this->assertEquals(['test' => 'test'], $this->BlogCommentMailer->viewBuilder()->getVars());
     }
+
+    /**
+     * test sendCommentToUser
+     */
+    public function testSendCommentToUser()
+    {
+        $this->BlogCommentMailer->sendCommentToUser('admin baser', 'user@example.com', ['test' => 'test']);
+        $this->assertEquals('BcBlog.blog_comment_contributor', $this->BlogCommentMailer->viewBuilder()->getTemplate());
+        $this->assertEquals(['test' => 'test'], $this->BlogCommentMailer->viewBuilder()->getVars());
+    }
 }
diff --git a/plugins/bc-custom-content/src/Event/BcCustomContentControllerEventListener.php b/plugins/bc-custom-content/src/Event/BcCustomContentControllerEventListener.php
index a1377bb964..1458f8687f 100755
--- a/plugins/bc-custom-content/src/Event/BcCustomContentControllerEventListener.php
+++ b/plugins/bc-custom-content/src/Event/BcCustomContentControllerEventListener.php
@@ -38,6 +38,7 @@ class BcCustomContentControllerEventListener extends \BaserCore\Event\BcControll
      * Before render
      * @checked
      * @noTodo
+     * @unitTest
      */
     public function startup(Event $event)
     {
@@ -51,6 +52,7 @@ public function startup(Event $event)
      * 管理画面メニュー用のデータをセットする
      * @checked
      * @noTodo
+     * @unitTest
      */
     public function setAdminMenu()
     {
diff --git a/plugins/bc-custom-content/src/View/Helper/CustomContentAdminHelper.php b/plugins/bc-custom-content/src/View/Helper/CustomContentAdminHelper.php
index 9214a58450..ec28068baa 100644
--- a/plugins/bc-custom-content/src/View/Helper/CustomContentAdminHelper.php
+++ b/plugins/bc-custom-content/src/View/Helper/CustomContentAdminHelper.php
@@ -322,6 +322,7 @@ public function getEntryIndexTitle(CustomTable $table, CustomEntry $entry)
      * プラグインのメタフィールドを表示する
      * @checked
      * @noTodo
+     * @unitTest
      */
     public function displayPluginMeta()
     {
diff --git a/plugins/bc-custom-content/tests/TestCase/Event/BcCustomContentControllerEventListenerTest.php b/plugins/bc-custom-content/tests/TestCase/Event/BcCustomContentControllerEventListenerTest.php
new file mode 100644
index 0000000000..db5665b0a9
--- /dev/null
+++ b/plugins/bc-custom-content/tests/TestCase/Event/BcCustomContentControllerEventListenerTest.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * baserCMS :  Based Website Development Project <https://basercms.net>
+ * Copyright (c) NPO baser foundation <https://baserfoundation.org/>
+ *
+ * @copyright     Copyright (c) NPO baser foundation
+ * @link          https://basercms.net baserCMS Project
+ * @since         5.0.0
+ * @license       https://basercms.net/license/index.html MIT License
+ */
+
+namespace BcCustomContent\Test\TestCase\Event;
+
+use BaserCore\Controller\Admin\UsersController;
+use BaserCore\Service\BcDatabaseServiceInterface;
+use BaserCore\Test\Factory\ContentFactory;
+use BaserCore\Test\Scenario\InitAppScenario;
+use BaserCore\TestSuite\BcTestCase;
+use BcCustomContent\Event\BcCustomContentControllerEventListener;
+use BcCustomContent\Service\CustomTablesServiceInterface;
+use BcCustomContent\Test\Factory\CustomContentFactory;
+use Cake\Core\Configure;
+use Cake\Event\Event;
+use Cake\Event\EventManager;
+use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
+
+/**
+ * Class BcCustomContentControllerEventListenerTest
+ *
+ * @property  BcCustomContentControllerEventListener $BcCustomContentControllerEventListener
+ */
+class BcCustomContentControllerEventListenerTest extends BcTestCase
+{
+    /**
+     * Trait
+     */
+    use ScenarioAwareTrait;
+
+    /**
+     * @var UsersController
+     */
+    public $UsersController;
+
+    /**
+     * @var EventManager|null
+     */
+    public $eventManager;
+
+    /**
+     * setUp
+     *
+     * @return void
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->loadFixtureScenario(InitAppScenario::class);
+        $this->eventManager = EventManager::instance();
+
+        $this->BcCustomContentControllerEventListener = new BcCustomContentControllerEventListener();
+        foreach ($this->BcCustomContentControllerEventListener->implementedEvents() as $key => $event) {
+            $this->eventManager->off($key);
+        }
+        $this->UsersController = new UsersController($this->loginAdmin($this->getRequest('/baser/admin/baser-core/users/')));
+    }
+
+    /**
+     * tearDown
+     *
+     * @return void
+     */
+    public function tearDown(): void
+    {
+        $this->BcCustomContentControllerEventListener = null;
+        parent::tearDown();
+    }
+
+    /**
+     * test startup
+     */
+    public function testStartupAnSetAdminMenu()
+    {
+        //データを生成
+        $dataBaseService = $this->getService(BcDatabaseServiceInterface::class);
+        $customTable = $this->getService(CustomTablesServiceInterface::class);
+        //カスタムテーブルとカスタムエントリテーブルを生成
+        $customTable->create(['id' => 1, 'name' => 'recruit_categories']);
+        CustomContentFactory::make(['id' => 1, 'custom_table_id' => 1])->persist();
+        ContentFactory::make([
+            'plugin' => 'BcCustomContent',
+            'type' => 'CustomContent',
+            'site_id' => 1,
+            'title' => 'サービスタイトル',
+            'entity_id' => 1,
+        ])->persist();
+
+        $listener = $this->getMockBuilder(BcCustomContentControllerEventListener::class)
+            ->onlyMethods(['implementedEvents'])
+            ->addMethods(['usersStartup'])
+            ->getMock();
+
+        $listener->method('implementedEvents')
+            ->willReturn(['Controller.BaserCore.Users.startup' => ['callable' => 'usersStartup']]);
+
+        $this->eventManager
+            ->on($listener)
+            ->on($this->BcCustomContentControllerEventListener)
+            ->dispatch(new Event('Controller.startup', $this->UsersController, []));
+
+        //メーニューにカスタムタイトルがあるか確認
+        $menu = Configure::read('BcApp.adminNavigation.Contents');
+        $this->assertEquals('サービスタイトル', $menu['CustomContent1']['title']);
+        //不要なテーブルを削除
+        $dataBaseService->dropTable('custom_entry_1_recruit_categories');
+    }
+}
diff --git a/plugins/bc-custom-content/tests/TestCase/View/Helper/CustomContentAdminHelperTest.php b/plugins/bc-custom-content/tests/TestCase/View/Helper/CustomContentAdminHelperTest.php
index e7aea1f25c..ea1ed5d294 100644
--- a/plugins/bc-custom-content/tests/TestCase/View/Helper/CustomContentAdminHelperTest.php
+++ b/plugins/bc-custom-content/tests/TestCase/View/Helper/CustomContentAdminHelperTest.php
@@ -4,6 +4,7 @@
 
 use BaserCore\Service\BcDatabaseServiceInterface;
 use BaserCore\TestSuite\BcTestCase;
+use BcBlog\View\BlogAdminAppView;
 use BcCustomContent\Model\Entity\CustomEntry;
 use BcCustomContent\Service\CustomEntriesServiceInterface;
 use BcCustomContent\Service\CustomTablesServiceInterface;
@@ -511,4 +512,23 @@ public function testError()
         $rs = $this->CustomContentAdminHelper->error($customLink, ['parent' => $customLinkParent]);
         $this->assertEquals('', $rs);
     }
+
+    /**
+     * test displayPluginMeta
+     */
+    public function testDisplayPluginMeta()
+    {
+        //準備
+        $view = new BlogAdminAppView($this->getRequest('/baser/admin'));
+        $view->loadHelper('BcAdminForm');
+        $this->CustomContentAdminHelper = new CustomContentAdminHelper($view);
+
+        //テスト
+        ob_start();
+        $this->CustomContentAdminHelper->displayPluginMeta();
+        $output = ob_get_clean();
+
+        //戻り値を確認
+        $this->assertTextContains('<label for="">自動補完郵便番号設定</label> ', $output);
+    }
 }
diff --git a/plugins/bc-mail/tests/TestCase/Service/Front/MailFrontServiceTest.php b/plugins/bc-mail/tests/TestCase/Service/Front/MailFrontServiceTest.php
index d995a1b89a..c2e60f6fbf 100644
--- a/plugins/bc-mail/tests/TestCase/Service/Front/MailFrontServiceTest.php
+++ b/plugins/bc-mail/tests/TestCase/Service/Front/MailFrontServiceTest.php
@@ -12,6 +12,7 @@
 namespace BcMail\Test\TestCase\Service\Front;
 
 use BaserCore\Test\Factory\ContentFactory;
+use BaserCore\Test\Factory\SiteConfigFactory;
 use BaserCore\Test\Scenario\InitAppScenario;
 use BaserCore\TestSuite\BcTestCase;
 use BaserCore\Utility\BcFile;
@@ -29,6 +30,7 @@
 use BcMail\Test\Scenario\MailContentsScenario;
 use BcMail\Test\Scenario\MailFieldsScenario;
 use Cake\ORM\Entity;
+use Cake\TestSuite\EmailTrait;
 use Cake\TestSuite\IntegrationTestTrait;
 use CakephpFixtureFactories\Scenario\ScenarioAwareTrait;
 use InvalidArgumentException;
@@ -46,6 +48,7 @@ class MailFrontServiceTest extends BcTestCase
      */
     use ScenarioAwareTrait;
     use IntegrationTestTrait;
+    use EmailTrait;
 
     /**
      * set up
@@ -483,7 +486,6 @@ public function test_getIndexTemplate()
 
     /**
      * test sendMail
-     * @throws \Throwable
      */
     public function test_sendMail()
     {
@@ -491,6 +493,7 @@ public function test_sendMail()
         $this->loadFixtureScenario(InitAppScenario::class);
         $this->loadFixtureScenario(MailContentsScenario::class);
         $this->loadFixtureScenario(MailFieldsScenario::class);
+        SiteConfigFactory::make(['name' => 'email', 'value' => 'basertest@example.com'])->persist();
         $MailContentsService = $this->getService(MailContentsServiceInterface::class);
         $MailMessagesService = $this->getService(MailMessagesServiceInterface::class);
         MailMessagesFactory::make(
@@ -525,8 +528,9 @@ public function test_sendMail()
         ])->persist();
         // normal case
         $mailContent = $MailContentsService->get(99);
-        $this->expectException(InvalidArgumentException::class);
         $this->MailFrontService->sendMail($mailContent, $mailMessage, []);
+        $this->assertMailSentTo('t@gm.com');
+        $this->assertMailSubjectContains('お問い合わせを頂きました99');
     }
 
     /**
diff --git a/plugins/bc-theme-config/src/Event/BcThemeConfigControllerEventListener.php b/plugins/bc-theme-config/src/Event/BcThemeConfigControllerEventListener.php
index 1b6dce75ff..925a87f6bd 100644
--- a/plugins/bc-theme-config/src/Event/BcThemeConfigControllerEventListener.php
+++ b/plugins/bc-theme-config/src/Event/BcThemeConfigControllerEventListener.php
@@ -13,6 +13,9 @@
 
 use BaserCore\Event\BcControllerEventListener;
 use Cake\Event\Event;
+use BaserCore\Annotation\UnitTest;
+use BaserCore\Annotation\NoTodo;
+use BaserCore\Annotation\Checked;
 
 /**
  * Class BcThemeConfigControllerEventListener
diff --git a/plugins/bc-theme-config/src/Model/Table/ThemeConfigsTable.php b/plugins/bc-theme-config/src/Model/Table/ThemeConfigsTable.php
index f61a3f556e..63155029ca 100644
--- a/plugins/bc-theme-config/src/Model/Table/ThemeConfigsTable.php
+++ b/plugins/bc-theme-config/src/Model/Table/ThemeConfigsTable.php
@@ -128,6 +128,13 @@ public function validationKeyValue(Validator $validator): Validator
             ]
         ]);
 
+        $validator->add('logo_link', [
+            'urlCheck' => [
+                'rule' => ['url', true],
+                'message' => __d('baser_core', '無効なURLです')
+            ]
+        ]);
+
         // main_image_1
         $validator->add('main_image_1', [
             'fileExt' => [
@@ -137,6 +144,13 @@ public function validationKeyValue(Validator $validator): Validator
             ]
         ]);
 
+        $validator->add('main_image_link_1',[
+            'urlCheck' => [
+                'rule' => ['url', true],
+                'message' => __d('baser_core', '無効なURLです')
+           ]
+        ]);
+
         // main_image_2
         $validator->add('main_image_2', [
             'fileExt' => [
@@ -146,6 +160,13 @@ public function validationKeyValue(Validator $validator): Validator
             ]
         ]);
 
+        $validator->add('main_image_link_2',[
+            'urlCheck' => [
+                'rule' => ['url', true],
+                'message' => __d('baser_core', '無効なURLです')
+           ]
+        ]);
+
         // main_image_3
         $validator->add('main_image_3', [
             'fileExt' => [
@@ -155,6 +176,13 @@ public function validationKeyValue(Validator $validator): Validator
             ]
         ]);
 
+        $validator->add('main_image_link_3',[
+            'urlCheck' => [
+                'rule' => ['url', true],
+                'message' => __d('baser_core', '無効なURLです')
+           ]
+        ]);
+
         // main_image_4
         $validator->add('main_image_4', [
             'fileExt' => [
@@ -164,6 +192,13 @@ public function validationKeyValue(Validator $validator): Validator
             ]
         ]);
 
+        $validator->add('main_image_link_4',[
+            'urlCheck' => [
+                'rule' => ['url', true],
+                'message' => __d('baser_core', '無効なURLです')
+           ]
+        ]);
+
         // main_image_5
         $validator->add('main_image_5', [
             'fileExt' => [
@@ -172,6 +207,13 @@ public function validationKeyValue(Validator $validator): Validator
                 'message' => __d('baser_core', '許可されていないファイルです。')
             ]
         ]);
+
+        $validator->add('main_image_link_5',[
+            'urlCheck' => [
+                'rule' => ['url', true],
+                'message' => __d('baser_core', '無効なURLです')
+           ]
+        ]);
         return $validator;
     }