am 6bbe678c: Improve test coverage.

* commit '6bbe678c30a7cd12b581996018b6da609f440c6d':
  Improve test coverage.