A little test clean-up while I adjust timezones