re-factor Set methods and add tests
fix wildcard pub-sub test