Refactoring
Updating translations with corrections. Also updated corresponding unit tests