Fixed tests to run when multi-threaded.
Merge pull request #2 from distantcam/master

Fixed tests to run when multi-threaded.