added phpunit
Merge branch 'phpunit-integration' into modules