Fix the incoming SPAChannel message
Fix tests
Merge pull request #373 from tOkeshu/fix-incoming-spa-channel-message

Fix the incoming SPAChannel message
sync with master