make TFS unit test have better variable naming.
Merge branch 'master' into ephemeral-data-port