[TIMOB-11869] Bug fixes. More unit test work.