Restructure so that different tests (drivers) may be configured to run.