Repairing the test suite due to changes in pytz