Improved unit test
Removed time zone handling