Refactor and reset the time in the setUp of the calendar test
Merge pull request #855 from zacc/revise_calendar_setup

Refactor and reset the time in the setUp of the calendar test