[FORWARD PORT] LPS-50773 add tests