added timezones and testing for EDT