Removed setEndTimeStamp/ setEndUuid from Criteria Test
Refactored some assert logic