Improve test suite and add descriptive statistics