am d0772319: Refactor unit tests to reduce code duplication.

* commit 'd07723191416e4e12161e14bddf786ba7579ae46':
  Refactor unit tests to reduce code duplication.