restructuring: phpunit working