fix set channel

#101
more, but smaller, tests

was correct but tests took too long
Merge branch 'feature-fixTest' into develop