Fixed maven build and a few test that broke when I removed i18n