add tests and update translator