Refactor the translations and add tests #122