Added getStatitistics tests, and moved old statistics functions