LPS-34320 Fix tests