Silence i18n message
Cleaning up some tests