Fix generation of type choices.
Fix new conversation tests (they now need to give the user appropriate permisions if they wish to create a conversation).