fix up uses of wait_for_agent
Merge pull request #155 from mikemccracken/ex-fixup-wait-for-agent

fix up uses of wait_for_agent