Patch Set 6: No score; No score

Quite close now.

Start considering automatic unit tests. We are short of them. Separating the operation and UI tests is /probably/ a good idea, but this varies from case to case.