Further unit test refinement name changes etc