Update tests to include ChannelResolver