Working on making unit test reliable.

There seems to be a race condition between when the message is queued
and the river is ready to dequeue it.