Update statistics generator to ignore test data #2492

for #2492