UPDATE: Fix unit tests
Phpmd changes dirs
Ant build issues fixed
Ant build issues fixed