MULE-7513: Fix broken tests