Make server tests create their own sample files
Refresh Debian patches with the latest changes