Improve test selector, hopefully