LPS-50596 Fixing failing tests due to date changes in this same ticket

Also improved tests with additional logic.

cc: @mdelapenya @cgoncas