Testing support files have been refactored.

Fixes #2552