LPS-35593 Fix tests