CLDCONNECT-1555: Fix broken functional tests