Cleaned up the code on CondorTest which fetches machine ads.

Rwwrote dollardollar macro test to have 8 checks and not be pass/fail
and removed concept of expecting to know what line something
is in the output file. #3594