Cleanup some tests to work across regions. cc #232