Issue #395 - Use css selectors that remove need for sleep calls

The tests will use the timeout instead.