Sftp functional test updates

Replaces #343