Tidy up
Move phpunit into dev dependency