tty => teletype, to avoid shadowing
Merge pull request #5711 from hulu/test-fixes

tty => teletype, to avoid shadowing