Selector's test coverage improvements