Removed unused params, implemented clean disconnect in test case.