[TIMOB-11869] More unit tests.
[TIMOB-11869] More work on the unit tests.