Change so mainQCDTest now can do any of qcdb,c,scatter. Update user options accordingly. May break other things
Update programs so they don't break.