Fixup integration tests to remove sets.
Fixup integration tests to remove sets.

fredthomsen/hyper,fredthomsen/hyper,irvind/hyper,jdecuyper/hyper,Lukasa/hyper,irvind/hyper,plucury/hyper,masaori335/hyper,masaori335/hyper,jdecuyper/hyper,lawnmowerlatte/hyper,Lukasa/hyper,lawnmowerlatte/hyper,plucury/hyper