Fix 2 failing tests on message_spec, one of them remains as pending.
Fix pending tests on message spec.