port tests to new Selector class
remove internal references to old selector classes and api