Added quick fix to Test module to handle phpunit.xml with path
Merge remote-tracking branch 'origin/master' into develop