Fix undefined references to pytz, and update tests

@mulby @dianakhuang could you two review?