Add the class 'Stats' and remove former inner class; update test