LPS-30322 Unit test, part 2