add conversation + tests