Update phpunit.xml.dist
Performance improvement on lookup
Add tests