Improve code coverage based on 0044440 commit.

Signed-off-by: crynobone <crynobone@gmail.com>