Fix ressources path
Add debug in phpunit
Merge upstream master conflicts