Fix conversation tests