client disconnect tests
refactoring for api parity