[FORWARD PORT] LPS-50685 add tests