Merge "Remove / restructure more tests running all locales"