Feature/phpunit 4