channel test
updated channel manager
finally channel tester
Merge remote-tracking branch 'origin/diffquery3' into diffquery