Changed ChannelKeeper to Router and moved to router.rb
Reinstated relevant channel tests and now passing