Improve test coverage following the last PR.