rework selector
new tests