CS Fixes And Minor Tweaks

I don't see the need to change this line. Can you explain why or please revert and do the same with `phpunit.xml`