more house cleaning:

  * removing redundant descriptions in when and then clauses
  * guarding against false positives in test setup