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.

Rename tests to test to fix python setup.py test functionality.