Also fixed some spurious failures in the bootstrap test.
Attach a file by drag & drop or click to upload
