LPS-35417 Fix broken tests