LPS-30341 Unit tests