Improved usage of composer an phpunit.

Revert some changes.