Fine tuned the tests to catch some more corner cases.

Adjusted the logic in install.py to match what was already there.

Signed-off-by: Tom Walsh <tom.walsh@expresshosting.net>