Commit 86d3bb66 accidentally broke two conversation tests by removing necessary waiting periods. GitLab: #1117 Change-Id: Idebd037b2bf9083f59a108455fea82f2203a3ece