EAGLESIX-2651: add missing call to reset() in AddToSet
EAGLESIX-2651: fix up test cases for new code