DRY up TestAdaptor and TestDriver classes