LPS-30322 Unit test, part 2
LPS-30322 SF