Add messages to subscription

Also organize it on a single module pusher_event and
fix a wrong test on subscription
Merge branch 'subscription-messages'