Improve forwarder test coverage.