updates function
updates fixtures, removes test junk that we won't be using anyway
refactors function to be a little cleaner and more accurate. updates fixtures, removes test junk since we won't be using it later anyway.