Also add some more tests. Based on patch by Sye van der Veen.
Attach a file by drag & drop or click to upload
