Fix all specs except comparator