Modifying tests to get them to pass both locally and on Travis.  Modified settingsmanager tests to include new parameters for ssh.