Fixed the unit tests and seperated the DateTimeIntervals.