LPS-30336 Unit tests