Merge pull request #544 from nulltoken/fix/thread-tests threads: Make the old test suite TLS aware...