Simplified code. Removed unneeded variable. Added time some zone based tests.