Use WaitForWatcherAndIncrement on the fake clock
Use WaitForWatcherAndIncrement on the fake clock

* also changed to use Eventually not Expect in Emit testing

Signed-off-by: Nima Kaviani <0ebde517669f70c2aec92dc89d4950413b825ec0@us.ibm.com>

cloudfoundry-incubator/executor