CARE #78: Fixed where conditions, added DateValueComparison with an optional date offset, added test