Different date handling, and a start on some tests.