Added unit tests and fixed bugs for specifying channel names/channels directly in Fsm definition