Slightly better names and cleaner tests. Please review
Attach a file by drag & drop or click to upload
