Added Channel Joining and unit tests