Added timezone support and tests
added timezone support and tests