Also improve tests to minimize assertions and make them more readable.
Attach a file by drag & drop or click to upload
