cherry picked more tests than i wanted.  restrict to just will's change