Establish test watches before triggering events

Establish watches in tests prior to doing things which will trigger
events to eliminate races.