Fix Region variant control LT-13801

Also added a test and fixed a couple of others

Change-Id: Ieb88bda7887b39e78be43a970f2e519821f7c92f