Fixed routing spec for messages
Fix all specs