more tests - fixed set scp uploader

coverage 45%.  Also remove unused sftp code