Improve test coverage

This commit adds some missing tests to reach 100% test coverage, at
least by lines.

Change-Id: I8fb7135bdc5b3a9fcab3cf1db249984a3eb74805