LPS-30341 Unit tests
LPS-30341 SF