Merge "Update TransportManager tests."