Add and extend statistics test