added comparators and corresponding tests