Revert "Revert "LPS-48102""
LPS-48102 fix test