Changed structure and phpunit config