Adding accountabilities.

Minor refactoring to remove some duplicate test code.