Try to bring KeySet and Bag tests up to spec.