Improve unit-test coverage

No match.