Add in more coverage for files and SSH
Add debugging output format