Fix up tests for new set difference.

More changes needed.