Move Channels and Router outside of test blocks