Fixes for tests failing for some regions, but noth others.
Some formatting corrections made it in as well. whoops.