Also modify test code to hopefully avoid deadlock on failure.
Attach a file by drag & drop or click to upload
