Fixed up tests after fixes to date/time