Bugfixes + fixing tests/psr-2