deflake tests.
Merge pull request #887 from brendandburns/proxy

Deflake proxy unit tests.