Clarity/translatablity improvements. Fixed test