Fix message content rspec
Fix one more tests