Add #disconnect test, and refactor #reconnect test to ensure that everything gets disconnected.