Try to bring Set tests closer to current spec.