WIP improving on messages_spec