Update expectations to be sets.

Not sure why I missed this during development, and there's no real
change to the functionality here.

Change-Id: Ifd1b3510f3962936facbff0d84a57e26b27b16a8