Temporary fudge for Set tests, while refactoring work continures