Repair (and simplify) tests in response to http://www.zope.org/Collectors/Zope/2308.
Attach a file by drag & drop or click to upload
