diff --git a/Theme/Backend/mail-create.tpl.php b/Theme/Backend/mail-create.tpl.php
index af9c14d..e28fe35 100755
--- a/Theme/Backend/mail-create.tpl.php
+++ b/Theme/Backend/mail-create.tpl.php
@@ -24,7 +24,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><td><input type="text" placeholder="&#xf040; <?= $this->getHtml('Subject'); ?>" name="subject">
                 <tr><td><td><input type="file" name="files" multiple>
                 <tr><td><td><div class="textarea" contenteditable="true" style="height: 400px;"></div><textarea placeholder="&#xf040;" style="display: none" name="mail"></textarea>
-                <tr><td><td><input type="submit" value="<?= $this->getHtml('Send', '0', '0'); ?>"> <input type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
+                <tr><td><td><input type="submit" value="<?= $this->getHtml('Send', '0', '0'); ?>" name="send-mail"> <input type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>" name="save-mail">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/mail-dashboard.tpl.php b/Theme/Backend/mail-dashboard.tpl.php
index 01d3d75..04c6c1f 100755
--- a/Theme/Backend/mail-dashboard.tpl.php
+++ b/Theme/Backend/mail-dashboard.tpl.php
@@ -36,7 +36,7 @@ echo $this->getData('nav')->render(); ?>
             <table id="profileList" class="default">
             <thead>
             <tr>
-                <td><span class="check"><input type="checkbox"></span>
+                <td><span class="check"><input type="checkbox" name="profile-list"></span>
                 <td><?= $this->getHtml('Tag'); ?>
                 <td class="wf-100"><?= $this->getHtml('Subject'); ?>
                 <td><?= $this->getHtml('From'); ?>
@@ -46,7 +46,7 @@ echo $this->getData('nav')->render(); ?>
                 foreach ($messages as $key => $value) : ++$count;
                 $url = UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?>
                 <tr>
-                    <td><span class="check"><input type="checkbox"></span>
+                    <td><span class="check"><input type="checkbox" name=""></span>
                     <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>
                     <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml(\str_replace('_',' ', \mb_decode_mimeheader($value->subject))); ?></a>
                     <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml($value->from); ?></a>
diff --git a/Theme/Backend/mail-out-view.tpl.php b/Theme/Backend/mail-out-view.tpl.php
index ccc2709..d2a9cd1 100755
--- a/Theme/Backend/mail-out-view.tpl.php
+++ b/Theme/Backend/mail-out-view.tpl.php
@@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?>
         <caption><?= $this->getHtml('Messages'); ?><i class="fa fa-download floatRight download btn"></i></caption>
         <thead>
         <tr>
-            <td><span class="check"><input type="checkbox"></span>
+            <td><span class="check"><input type="checkbox" name=""></span>
             <td><?= $this->getHtml('Tag'); ?>
             <td class="wf-100"><?= $this->getHtml('Subject'); ?>
             <td><?= $this->getHtml('From'); ?>
@@ -42,7 +42,7 @@ echo $this->getData('nav')->render(); ?>
         <?php $count = 0; foreach ($sent as $key => $value) : ++$count;
         $url         = \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?>
         <tr>
-            <td><span class="check"><input type="checkbox"></span>
+            <td><span class="check"><input type="checkbox" name=""></span>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml(\str_replace('_',' ', \mb_decode_mimeheader($value->subject))); ?></a>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml($value->from); ?></a>
diff --git a/Theme/Backend/mail-spam-view.tpl.php b/Theme/Backend/mail-spam-view.tpl.php
index ccc2709..d2a9cd1 100755
--- a/Theme/Backend/mail-spam-view.tpl.php
+++ b/Theme/Backend/mail-spam-view.tpl.php
@@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?>
         <caption><?= $this->getHtml('Messages'); ?><i class="fa fa-download floatRight download btn"></i></caption>
         <thead>
         <tr>
-            <td><span class="check"><input type="checkbox"></span>
+            <td><span class="check"><input type="checkbox" name=""></span>
             <td><?= $this->getHtml('Tag'); ?>
             <td class="wf-100"><?= $this->getHtml('Subject'); ?>
             <td><?= $this->getHtml('From'); ?>
@@ -42,7 +42,7 @@ echo $this->getData('nav')->render(); ?>
         <?php $count = 0; foreach ($sent as $key => $value) : ++$count;
         $url         = \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?>
         <tr>
-            <td><span class="check"><input type="checkbox"></span>
+            <td><span class="check"><input type="checkbox" name=""></span>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml(\str_replace('_',' ', \mb_decode_mimeheader($value->subject))); ?></a>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml($value->from); ?></a>
diff --git a/Theme/Backend/mail-trash-view.tpl.php b/Theme/Backend/mail-trash-view.tpl.php
index ccc2709..d2a9cd1 100755
--- a/Theme/Backend/mail-trash-view.tpl.php
+++ b/Theme/Backend/mail-trash-view.tpl.php
@@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?>
         <caption><?= $this->getHtml('Messages'); ?><i class="fa fa-download floatRight download btn"></i></caption>
         <thead>
         <tr>
-            <td><span class="check"><input type="checkbox"></span>
+            <td><span class="check"><input type="checkbox" name=""></span>
             <td><?= $this->getHtml('Tag'); ?>
             <td class="wf-100"><?= $this->getHtml('Subject'); ?>
             <td><?= $this->getHtml('From'); ?>
@@ -42,7 +42,7 @@ echo $this->getData('nav')->render(); ?>
         <?php $count = 0; foreach ($sent as $key => $value) : ++$count;
         $url         = \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?>
         <tr>
-            <td><span class="check"><input type="checkbox"></span>
+            <td><span class="check"><input type="checkbox" name=""></span>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml(\str_replace('_',' ', \mb_decode_mimeheader($value->subject))); ?></a>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml($value->from); ?></a>
diff --git a/Theme/Backend/message-settings.tpl.php b/Theme/Backend/message-settings.tpl.php
index 9dbb542..92e8fbe 100755
--- a/Theme/Backend/message-settings.tpl.php
+++ b/Theme/Backend/message-settings.tpl.php
@@ -58,7 +58,7 @@ echo $this->getData('nav')->render(); ?>
                             <option value="<?= $this->printHtml($box); ?>"><?= $this->printHtml($box); ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td><input type="submit" value="<?= $this->getHtml('Save'); ?>">
+                <tr><td><input type="submit" value="<?= $this->getHtml('Save'); ?>" name="save-message">
             </table>
         </form>
     </div>
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index 252a62f..d46fd31 100755
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+declare(strict_types=1);
 
 // Modules/tests