Fixing Selector, added unit tests