LPS-51291 Fix broken tests