Install phpunit via composer; fix tests