change equality to conform to more regular new api. some of test4 now pass.