More test refactoring in state.

More splitting up of a coming branch.

This branch adds explicit owners to the methods to add testing services.