thread safe enabled & test added