CS fixes and tidy up of tests

Could you also use `./vendor/bin/phpunit` in `.travis.yml`?