Add more test coverage and add some comparators