Adapted fixtures for Elcodi Entity Translations

* Some improvements as well included