fixes and add unittest

Signed-off-by: TAKAHASHI Minoru <takahashi.minoru7@gmail.com>