Finish transport renaming in the tests

Change-Id: Ied47c578406d190c0964d841121c298792813173
Merge "Finish transport renaming in the tests"