[TIMOB-11869] Added some unit test and code coverage awesomeness.