Modified tests to handle datetime, bugfix
Merge pull request #539 from somayjain/newbranch

Modified tests to handle datetime, bugfix