Set user-selected timezone in setUp to override the nitz setting
Update test_calendar_today_date with simplified date
Merge pull request #1117 from zacc/mas_cal_date_tz

Set user-selected timezone in setUp to override the nitz setting