Simplify flakey test selectors