Fixing test that would fail periodically
Merge pull request #493 from wpreul/bug/486

Fixing test that would fail periodically