FIX: Update dependency graph, errors in phpunit.xml.dist