LPS-30715 Added Unit Tests