Cleaned up dateTime generator a little along with tests.