Added more tests and code in support of the custom equality thing.