Remove thread.sleep from unit test to speed it up

.. and apparently formatting and imports changed a bunch ...