Corrected a few missed references to old test settings