r26507 - refactor: use shared test methods in more places by @midgley

Top