diff --git a/composer.json b/composer.json
index 99964656..fb033a94 100644
--- a/composer.json
+++ b/composer.json
@@ -37,6 +37,7 @@
 	"maximebf/consolekit": "^1.0",
 	"monolog/monolog": "^2.0.1",
 	"php": "^7.3",
+	"psr/container":"~1.0",
 	"psr/http-message": "~1.0",
 	"psr/log": "~1.0",
 	"yosymfony/toml": "^1.0"
@@ -64,7 +65,6 @@
 	"clean": "vendor/bin/robo clean",
 	"coverage": "phpdbg -qrr -- vendor/bin/phpunit -c build",
 	"phpstan": "phpstan analyse -c phpstan.neon",
-	"psalm": "vendor/bin/psalm",
 	"watch:css": "cd public && npm run watch:css",
 	"watch:js": "cd public && npm run watch:js",
 	"test": "vendor/bin/phpunit -c build --no-coverage",
diff --git a/src/Ion/Di/Exception/ContainerException.php b/src/Ion/Di/Exception/ContainerException.php
index d4a385cb..1f9ab88d 100644
--- a/src/Ion/Di/Exception/ContainerException.php
+++ b/src/Ion/Di/Exception/ContainerException.php
@@ -17,12 +17,12 @@
 namespace Aviat\Ion\Di\Exception;
 
 use Exception;
-use Interop\Container\Exception\ContainerException as InteropContainerException;
+use Psr\Container\ContainerExceptionInterface;
 
 /**
  * Generic exception for Di Container
  */
-class ContainerException extends Exception implements InteropContainerException {
+class ContainerException extends Exception implements ContainerExceptionInterface {
 
 }
 // End of ContainerException.php
\ No newline at end of file
diff --git a/src/Ion/Di/Exception/NotFoundException.php b/src/Ion/Di/Exception/NotFoundException.php
index 1ce8592e..214f7690 100644
--- a/src/Ion/Di/Exception/NotFoundException.php
+++ b/src/Ion/Di/Exception/NotFoundException.php
@@ -16,13 +16,13 @@
 
 namespace Aviat\Ion\Di\Exception;
 
-use Interop\Container\Exception\NotFoundException as InteropNotFoundException;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Exception for Di Container when trying to access a
  * key that doesn't exist in the container
  */
-class NotFoundException extends ContainerException implements InteropNotFoundException {
+class NotFoundException extends ContainerException implements NotFoundExceptionInterface {
 
 }
 // End of NotFoundException.php
\ No newline at end of file
diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Full webp URL__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Full webp URL__1.php
deleted file mode 100644
index f852d0bc..00000000
--- a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Full webp URL__1.php	
+++ /dev/null
@@ -1 +0,0 @@
-<?php return '<picture><source srcset="https://www.example.com/image.webp" type="image/webp" /><source srcset="https://www.example.com/image.jpg" type="image/jpeg" /><img src="https://www.example.com/image.jpg" alt="" /></picture>';
diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Partial webp URL__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Partial webp URL__1.php
deleted file mode 100644
index 4b6711e0..00000000
--- a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set Partial webp URL__1.php	
+++ /dev/null
@@ -1 +0,0 @@
-<?php return '<picture><source srcset="https://localhost/assets/images/anime/15424.webp" type="image/webp" /><source srcset="https://localhost/assets/images/anime/15424.jpg" type="image/jpeg" /><img src="https://localhost/assets/images/anime/15424.jpg" alt="" /></picture>';
diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set bmp with gif fallback__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set bmp with gif fallback__1.php
deleted file mode 100644
index ee4c502d..00000000
--- a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set bmp with gif fallback__1.php	
+++ /dev/null
@@ -1 +0,0 @@
-<?php return '<picture><source srcset="https://localhost/assets/images/avatar/25.bmp" type="image/bmp" /><source srcset="https://localhost/assets/images/avatar/25.gif" type="image/gif" /><img src="https://localhost/assets/images/avatar/25.gif" alt="" /></picture>';
diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set jpeg2000__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set jpeg2000__1.php
deleted file mode 100644
index 0cecd592..00000000
--- a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set jpeg2000__1.php	
+++ /dev/null
@@ -1 +0,0 @@
-<?php return '<picture><source srcset="https://localhost/assets/images/foo.jpf" type="image/jpx" /><source srcset="https://localhost/assets/images/foo.jpg" type="image/jpeg" /><img src="https://localhost/assets/images/foo.jpg" alt="" /></picture>';
diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set png placeholder image__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set png placeholder image__1.php
deleted file mode 100644
index 054958a1..00000000
--- a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set png placeholder image__1.php	
+++ /dev/null
@@ -1 +0,0 @@
-<?php return '<img src="https://localhost/assets/images/placeholder.png" alt="placeholder.png" />';
diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set simple image with attributes__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set simple image with attributes__1.php
deleted file mode 100644
index 2b3023ef..00000000
--- a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set simple image with attributes__1.php	
+++ /dev/null
@@ -1 +0,0 @@
-<?php return '<img src="https://localhost/assets/images/foo.jpg" alt="should exist" width="200" height="200" />';
diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set svg with png fallback and lots of attributes__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set svg with png fallback and lots of attributes__1.php
deleted file mode 100644
index a8900e93..00000000
--- a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set svg with png fallback and lots of attributes__1.php	
+++ /dev/null
@@ -1 +0,0 @@
-<?php return '<picture width="200" height="300"><source srcset="https://localhost/assets/images/example.svg" type="image/svg+xml" /><source srcset="https://localhost/assets/images/example.png" type="image/png" /><img src="https://localhost/assets/images/example.png" alt="Example text" /></picture>';
diff --git a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set webp placeholder image__1.php b/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set webp placeholder image__1.php
deleted file mode 100644
index d796ce75..00000000
--- a/tests/AnimeClient/Helper/__snapshots__/PictureHelperTest__testPictureHelper with data set webp placeholder image__1.php	
+++ /dev/null
@@ -1 +0,0 @@
-<?php return '<picture><source srcset="https://localhost/assets/images/placeholder.webp" type="image/webp" /><source srcset="https://localhost/assets/images/placeholder.png" type="image/png" /><img src="https://localhost/assets/images/placeholder.png" alt="" /></picture>';
diff --git a/tests/Ion/test_data/XML/minifiedXmlTestFile.xml b/tests/Ion/test_data/XML/minifiedXmlTestFile.xml
deleted file mode 100644
index c0490c7c..00000000
--- a/tests/Ion/test_data/XML/minifiedXmlTestFile.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry><foo><bar><baz>42</baz></bar></foo><episode>11</episode><status>watching</status><score>7</score><storage_type>1</storage_type><storage_value>2.5</storage_value><times_rewatched>1</times_rewatched><rewatch_value>3</rewatch_value><date_start>01152015</date_start><date_finish>10232016</date_finish><priority>2</priority><enable_discussion>0</enable_discussion><enable_rewatching>1</enable_rewatching><comments>Should you say something?</comments><tags>test tag, 2nd tag</tags></entry>
diff --git a/tests/Ion/test_data/XML/xmlTestFile.xml b/tests/Ion/test_data/XML/xmlTestFile.xml
deleted file mode 100644
index b37cf964..00000000
--- a/tests/Ion/test_data/XML/xmlTestFile.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry>
-	<foo>
-		<bar>
-			<baz>42</baz>
-		</bar>
-	</foo>
-	<episode>11</episode>
-	<status>watching</status>
-	<score>7</score>
-	<storage_type>1</storage_type>
-	<storage_value>2.5</storage_value>
-	<times_rewatched>1</times_rewatched>
-	<rewatch_value>3</rewatch_value>
-	<date_start>01152015</date_start>
-	<date_finish>10232016</date_finish>
-	<priority>2</priority>
-	<enable_discussion>0</enable_discussion>
-	<enable_rewatching>1</enable_rewatching>
-	<comments>Should you say something?</comments>
-	<tags>test tag, 2nd tag</tags>
-</entry>
\ No newline at end of file