* reduce a bit of code duplication
* use unique content for each test
* fix wrong order of dictionary overrides:
  "kwargs.update(...)" -> "...update(kwargs)"
  The problem was not visible, since only "public" was overriden (which
  was not part of the default dictionary).