Refactored IChannel interface
Fixed some tests