improved layout
phpunit-tests added