Remove thread.sleep from unit test to speed it up

.. and apparently formatting and imports changed a bunch ...
Merge pull request #316 from benjchristensen/fix-slow-unit-test

Remove thread.sleep from unit test to speed it up