add translation fix and tests