Simplify scheduling of mock observers.

Closes #567 

@loganj @edenman 
How did this even work before? The test wasn't correct at all.