Fix flakey test selectors
Merge pull request #626 from muffinresearch/fix-flakey-test

Simplify flakey test selectors