#JC-2020:Fixed review remarks, added missing tests
#JC-2020:Localization added