diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 00fd8b6..0917375 100644
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -100,4 +100,5 @@ return ['SupplierManagement' => [
     'Wire'           => 'Wire',
     'YTDSales'       => 'YTD Sales',
     'Zip'            => 'Zip',
+    'IMG_alt_map'            => 'Map',
 ]];
diff --git a/Theme/Backend/supplier-create.tpl.php b/Theme/Backend/supplier-create.tpl.php
index 3be8a4a..2e911ce 100755
--- a/Theme/Backend/supplier-create.tpl.php
+++ b/Theme/Backend/supplier-create.tpl.php
@@ -45,7 +45,7 @@ echo $this->getData('nav')->render(); ?>
                             <tr><td><input type="text" id="iName2" name="name2" placeholder="&#xf040;">
                             <tr><td><label for="iName3"><?= $this->getHtml('Name3'); ?></label>
                             <tr><td><input type="text" id="iName3" name="name3" placeholder="&#xf040;">
-                            <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
+                            <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>" name="create-supplier">
                         </table>
                     </form>
                 </div>
diff --git a/Theme/Backend/supplier-list.tpl.php b/Theme/Backend/supplier-list.tpl.php
index d0c2504..f561c97 100755
--- a/Theme/Backend/supplier-list.tpl.php
+++ b/Theme/Backend/supplier-list.tpl.php
@@ -106,7 +106,7 @@ echo $this->getData('nav')->render(); ?>
                  $url        = UriFactory::build('{/prefix}purchase/supplier/profile?{?}&id=' . $value->getId());
                  $image      = $value->getFileByType(0); ?>
                 <tr data-href="<?= $url; ?>">
-                    <td><a href="<?= $url; ?>"><img width="30" loading="lazy" class="item-image"
+                    <td><a href="<?= $url; ?>"><img alt="<?= $this->getHtml('IMG_alt_supplier'); ?>" width="30" loading="lazy" class="item-image"
                             src="<?= $image instanceof NullMedia ?
                                         UriFactory::build('Web/Backend/img/user_default_' . \mt_rand(1, 6) .'.png') :
                                         UriFactory::build('{/prefix}' . $image->getPath()); ?>"></a>
diff --git a/Theme/Backend/supplier-profile.tpl.php b/Theme/Backend/supplier-profile.tpl.php
index 1ceac3f..c4976e6 100755
--- a/Theme/Backend/supplier-profile.tpl.php
+++ b/Theme/Backend/supplier-profile.tpl.php
@@ -77,7 +77,7 @@ echo $this->getData('nav')->render();
                                 </table>
                             </div>
                             <div class="portlet-foot">
-                                <input type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>"> <input type="submit" value="<?= $this->getHtml('Delete', '0', '0'); ?>">
+                                <input type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>" name="save-supplier-profile"> <input type="submit" value="<?= $this->getHtml('Delete', '0', '0'); ?>" name="delete-supplier-profile">
                             </div>
                         </form>
                     </section>
@@ -135,15 +135,15 @@ echo $this->getData('nav')->render();
                                 <tr><td><input type="text" id="iName1" name="name1" value="<?= $this->printHtml($supplier->mainAddress->postal); ?>" required>
                                 <tr><td><label for="iName1"><?= $this->getHtml('City'); ?></label>
                                 <tr><td><input type="text" id="iName1" name="name1" value="<?= $this->printHtml($supplier->mainAddress->city); ?>" required>
-                                <tr><td><label for="iName1"><?= $this->getHtml('Country'); ?></label>
-                                <tr><td><select>
+                                <tr><td><label for="iCountry"><?= $this->getHtml('Country'); ?></label>
+                                <tr><td><select id="iCountry" name="country">
                                     <?php foreach ($countryCodes as $code3 => $code2) : ?>
                                         <option value="<?= $this->printHtml($code2); ?>"<?= $this->printHtml($code2 === $supplier->mainAddress->getCountry() ? ' selected' : ''); ?>><?= $this->printHtml($countries[$code3]); ?>
                                     <?php endforeach; ?>
                                 </select>
                                 <tr><td>
                                     <?php if (\is_file(__DIR__ . '/../../../../phpOMS/Localization/Maps/svg/' . \strtolower($supplier->mainAddress->getCountry()) . '.svg')) : ?>
-                                    <img id="iMap" style="width: 100%;" src="<?= UriFactory::build('phpOMS/Localization/Maps/svg/' . \strtolower($supplier->mainAddress->getCountry()) . '.svg'); ?>">
+                                    <img alt="<?= $this->getHtml('IMG_alt_map'); ?>" id="iMap" style="width: 100%;" src="<?= UriFactory::build('phpOMS/Localization/Maps/svg/' . \strtolower($supplier->mainAddress->getCountry()) . '.svg'); ?>">
                                     <?php endif; ?>
                             </table>
                         </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