Thread provider updates, fixes tests