Fix test case for date issue
Resolve merge conflict
Merge pull request #565 from ayushchd/unit_testing_2

Fix test case for date issue