Incremental work on unit test refactoring.