stat fixig test and cleanup things