am 76076ab5: A bit more test refactoring, and remove DSA.

* commit '76076ab5a517dce12bdcd9ace23738c8dacc2f05':
  A bit more test refactoring, and remove DSA.