Replace messy tests with cleaned-up versions from trunk.
Attach a file by drag & drop or click to upload