more test & add Stats