Merge "Improve InputTransport test coverage"