Fix translation, add simple unit test