Fix some issues with conversation testing.