fixing two channel test, added isClosed checks

Change-Id: I14ccdc65a2d09c1737346e937b013a47dc48d9e0