Add specs for new message stuff