fix up shepherd tests for q api changes

Hello @nicks, 

Please review the following commits I made in branch 'nick-updates'.

db23744e53ce7b9cb766384e5db980b686c67411 (2014-05-15 16:19:56 -0400)
fix up shepherd tests for q api changes

R=@nicks