removed obsolete service definition
added custom ExceptionListener

refactored unit tests,
ran php-cs-fixer