Refactor message spec
Add test for has many messages