Refactor DateTime tests
Fix dealing with time components when no date component