LPS-38386 Unit tests
LPS-38386 SF