Used WastonSimgleSampleGFRTest to find and correct multiple bugs