MULE-7557 Fix multiple failing tests