cleaning up tests, getting disconnect test to pass