Use the correct STL atomic type
Fixing wording, and adding more threading tests