Fix expected output to match actual output for setuptools
and pip installation progress.  The progress line has been
one line for a while but the expected output was looking for
two lines.
Merge pull request #635 from shidesthewise/feature/testfix-1

Fixes for validating activation output and setuptools test integration.