Fixing queries used in waitForTriples calls to be the same as other checks

Fixes http://www.pivotaltracker.com/story/show/61351914