LPS-50423 Unit tests
LPS-50423 SF