Implement unit test comparators for many more types, and start refactoring compareItems() helper.