Tests for TZ fixes, and another TZ fix