Test refactor: Comparator