LPS-47894 Fix test
LPS-49552 Add check to SF