Add some time zone tests; Fix time zone method