diff --git a/Files/01/24/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/01/24/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/01/24/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/02/7e/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/02/7e/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/02/7e/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/07/36/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/07/36/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/07/36/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/13/54/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/13/54/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/13/54/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/17/38/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/17/38/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/17/38/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/1c/88/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/1c/88/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/1c/88/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/2a/e4/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/2a/e4/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/2a/e4/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/31/0d/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/31/0d/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/31/0d/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/4e/f7/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/4e/f7/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/4e/f7/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/55/70/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/55/70/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/55/70/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/56/07/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/56/07/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/56/07/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/5d/1a/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/5d/1a/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/5d/1a/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/5e/7d/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/5e/7d/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/5e/7d/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/60/80/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/60/80/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/60/80/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/6c/d1/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/6c/d1/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/6c/d1/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/76/60/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/76/60/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/76/60/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/9e/ad/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/9e/ad/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/9e/ad/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/a4/ea/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/a4/ea/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/a4/ea/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/a9/ec/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/a9/ec/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/a9/ec/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/ab/25/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/ab/25/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/ab/25/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/b7/10/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/b7/10/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/b7/10/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/c4/6c/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/c4/6c/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/c4/6c/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/c7/fd/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/c7/fd/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/c7/fd/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/d9/0d/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/d9/0d/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/d9/0d/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/de/30/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/de/30/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/de/30/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/e0/c6/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/e0/c6/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/e0/c6/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/e3/49/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/e3/49/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/e3/49/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/Files/f2/c7/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png b/Files/f2/c7/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png
new file mode 100644
index 0000000..28d5ef5
Binary files /dev/null and b/Files/f2/c7/120cf807c0b4e4cb3843ed3661ba9239513e2e64.png differ
diff --git a/tests/ControllerTest.php b/tests/ControllerTest.php
index 7eb70b7..53e1475 100644
--- a/tests/ControllerTest.php
+++ b/tests/ControllerTest.php
@@ -23,8 +23,6 @@ use phpOMS\Event\EventManager;
 use phpOMS\Module\ModuleManager;
 use phpOMS\Router\WebRouter;
 
-require_once __DIR__ . '/../../tests/Autoloader.php';
-
 /**
  * @internal
  */
diff --git a/tests/Models/CollectionTest.php b/tests/Models/CollectionTest.php
index 70f995c..349bb94 100644
--- a/tests/Models/CollectionTest.php
+++ b/tests/Models/CollectionTest.php
@@ -82,14 +82,14 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
 
     public function testSourceInputOutput() : void
     {
-        $this->media->setSources([new NullMedia(1), new NullMedia(2), new NullMedia(3)]);
-        self::assertEquals([new NullMedia(1), new NullMedia(2), new NullMedia(3)], $this->media->getSources());
+        $this->media->setSources([$a = new NullMedia(1), $b = new NullMedia(2), $c = new NullMedia(3)]);
+        self::assertEquals([$a, $b, $c], $this->media->getSources());
     }
 
     public function testSourceAddInputOutput() : void
     {
-        $this->media->setSources([new NullMedia(1), new NullMedia(2), new NullMedia(3)]);
-        $this->media->addSource(new NullMedia(4));
-        self::assertEquals([new NullMedia(1), new NullMedia(2), new NullMedia(3), new NullMedia(4)], $this->media->getSources());
+        $this->media->setSources([$a = new NullMedia(1), $b = new NullMedia(2), $c = new NullMedia(3)]);
+        $this->media->addSource($d = new NullMedia(4));
+        self::assertEquals([$a, $b, $c, $d], $this->media->getSources());
     }
 }
diff --git a/tests/Models/MediaMapperTest.php b/tests/Models/MediaMapperTest.php
index b39dfa5..9666196 100644
--- a/tests/Models/MediaMapperTest.php
+++ b/tests/Models/MediaMapperTest.php
@@ -23,7 +23,7 @@ use Modules\Media\Models\MediaMapper;
  */
 class MediaMapperTest extends \PHPUnit\Framework\TestCase
 {
-    public function testCRUD() : void
+    public function testCR() : void
     {
         $media = new Media();
         $media->setCreatedBy(new NullAccount(1));