Increase UT coverage.

Change-Id: Ibc7b780e5fe5dae6c68e28440cbc1263d0ac3b16
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>