Fix undefined references to pytz
fix tests
Merge pull request #2883 from edx/db/fix-import

Fix undefined references to pytz, and update tests