MULE-7030: Fixing broken tests