updated to IndexedSet and using intern for tests