Second attempt to correct time zone issues in calendar and test spec.