fixing tests which were broken when the data structure was corrected to match production results