Moved tests down to tests/src/. Updated phpunit.xml to be in line with other projects.
Merge