Add phpunit as dev dep
Adjust formatting, indentation, etc