Added more tests around channel handling
v1.1.8