Code rewrite
Updated phpunit directory's
Updated test for the rewrite