Test improvements

refs #4309
- replace waitForResource with waitForSelector to prevent UI timing
issues.