Raw date values should always be datetimes.
Fix _make_criteria method for use with queries.
Extend test coverage.