Tests for TZ fixes, and another TZ fix
Merge pull request #1 from zostay/master

Tests for TZ fixes, and another TZ fix