- Make TestMain be driver-based - Move config to TestMain file - Make config a little more sane in pgmain