Trying to clean up tests.
Made tests async.

Prevented connect block from being called on disconnect.