Fixed the date tests
Merge conflicts resolved