Move unnecessary items out of pytest.raises context
Reorganize tests in test_channel.py