Improved some singleton channel logic.

Actually made all the unit tests pertain to SingletonChannel