Refactor ssh and test modules. I realize that there is a need for class consolidation.
Merge remote-tracking branch 'origin/master'