Fix test threading issue.
Fix test naming.