- Refactored Comparator tests.
- Littl changes on some coparators, especially comments