fix names to keep consistent of style
improve UT to cover more cases under GetStatistics