Added more extensibility points in TestXxxRunner classes, and fixed up two cases where work was being done in the wrong place.