Improve Date testing