LPS-35650 and LPS-35878 Junit tests

The promise is a debt

@mdelapenya