MT#7191 Fix tests (country selection support)