Tweak Set::clear unit test
Merge in release 2.3.0 changes