diff --git a/Theme/Backend/Components/Event/popup.tpl.php b/Theme/Backend/Components/Event/popup.tpl.php
index 18c7f4f..d2a8b9a 100755
--- a/Theme/Backend/Components/Event/popup.tpl.php
+++ b/Theme/Backend/Components/Event/popup.tpl.php
@@ -6,13 +6,13 @@
             <form>
                 <table class="layout">
                     <tr><td><label for="iTitle">Title</label>
-                    <tr><td><input type="text" id="">
+                    <tr><td><input type="text" id="" name="">
                     <tr><td><label for="iTitle">Description</label>
                     <tr><td><textarea></textarea>
                     <tr><td><label for="iTitle">To</label>
-                    <tr><td><input type="text" id="">
+                    <tr><td><input type="text" id="" name="">
                     <tr><td><label for="iTitle">Files</label>
-                    <tr><td><input type="text" id="">
+                    <tr><td><input type="text" id="" name="files">
                     <tr><td><button type="button" data-action='[
                                     {
                                         "listener": "click", "action": [
diff --git a/Theme/Backend/calendar-dashboard.tpl.php b/Theme/Backend/calendar-dashboard.tpl.php
index 3e9fac2..0fd6589 100755
--- a/Theme/Backend/calendar-dashboard.tpl.php
+++ b/Theme/Backend/calendar-dashboard.tpl.php
@@ -84,7 +84,7 @@ $calendar = $this->getData('calendar');
                         <tr>
                             <td><label>Layout</label>
                         <tr>
-                            <td><select>
+                            <td><select name="layout">
                                     <option>
                                 </select>
                     </table>
@@ -97,7 +97,7 @@ $calendar = $this->getData('calendar');
 
             <div class="inner">
                 <ul class="boxed">
-                    <li><i class="fa fa-times warning"></i> <span class="check"><input type="checkbox" id="iDefault" checked><label for="iDefault">Default</label></span><i class="fa fa-cogs floatRight"></i>
+                    <li><i class="fa fa-times warning"></i> <span class="check"><input name="cal-0" type="checkbox" id="iDefault" checked><label for="iDefault">Default</label></span><i class="fa fa-cogs floatRight"></i>
                 </ul>
                 <div class="spacer"></div>
                 <button><i class="fa fa-calendar-plus-o"></i> <?= $this->getHtml('Add', '0', '0'); ?></button> <button><i class="fa fa-calendar-check-o"></i> <?= $this->getHtml('Create', '0', '0'); ?></button>
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