WIP cleaning up 'messages_spec'