Refactored TimestampCriteria class and CriteriaBuilderSpecs