LPS-41543 Fix tests