fixed failed test due to time_zone
reactoring
commented code