Tweaked a Set type checked contain test and fixed some broken tests that were testing the
performance optimization we are no longer doing.