Added more functionality statistics-loader and tests