Cleanup exceptions layout
Fix phpunit version