Merge pull request #8 from dclendenan/master

Upstream proxy support and unit test extensions.
fix test count
Merge pull request #9 from dclendenan/master

Test correction for "skip all" case
fix test count
remove duplicate diag