Set date accordingly to what we're testing on
Merge branch 'fix_calendar_test'