Modify locales files and location and organizers tests