Added PHPUnit Enricher
Remove unused uses