Better unit-test coverage