Selector: add functions to test selector
Module|Selector: refactor function name/location