LPS-44359 Fix broken tests