Move stats outsite of set and tests for that
Improved tests
Mix various tests