[TESTS] Fix unit tests for branch es-1.4

Some changes were not reported in branch es-1.4.