Improve the statistics collection test
Clean up statistics collection (sort members)