switch to sets and add tests