refactoring & thread counting test...