Minimize setTimeout delays in tests
Merge pull request #137 from ryanseys/master

Minimize setTimeout delays in tests