LPS-35650

LPS-35650 and LPS-35878 Junit tests