Added comparator test back