Fudge some now passing keyset|set tests