fixing more functional tests
Merge branch 'data-channels' of git://github.com/drewfish/mojito into data-channels