Fix flakey test selectors