Simplify code
Merge
Use preinstalled phpunit
Merge