Minor refactoring
Added StatisticsTests