Minimize setTimeout delays in tests

Mocha was giving warnings that a few tests were running slowly. In both cases, the reason was that there was a `setTimeout` running a few callbacks under a significant delay. I reduced the time to 1ms and tests still passed so I don't see why the delay was necessary. If the delay **is necessary**, perhaps these tests should be failing under the new conditions I've set. 

If someone can shed some light on why the callbacks are called under a `setTimeout` in the first place, that would also help me out.
I took the setTimeout completely out and the tests still passed... perhaps this should be re-written to use the waitQueue (for which I'm not familiar with yet)