Fix item-item-CF such that it works.  :)

Also upgraded item-item-CF unit tests.