Refactor tests and add Remote ChannelManager tests