update translator, add tests