Refactored base long-run tests.
Remove duplicate websocket clients.