some code reshuffling

separate test bench for more selectors introduced