Improve test coverage.

Change-Id: Ic9e5c82eec18fdc6bfa18dea2c545c5888c3778e