Removed redundant dependencies
Moved phpunit.xml to test directory