Also renamed some other tests to make them shorter and more legible
Attach a file by drag & drop or click to upload
