Merge "More DateUtilsTest tidying."