More test references removed