fixed merge conflict
fixed merge conflict
Merge pull request #68 from extensibleweb/Date-type-tests

Date type tests (+minor fixes)