More statistics
Added tests
More tests