Establish test watches before triggering events

Establish watches in tests prior to doing things which will trigger
events to eliminate races.
Merge pull request #308 from ironcladlou/deploy-test-race-prevention

Establish test watches before triggering events