Fixes for translation related test fails