Patch Set 7: (6 inline comments)

- good, all tests are passing now
- some style nits and typos found
- some tests must be wrong or missing see bug 317371
- I'll try to understand the tests in detail soon