Fix TestWorld failing.
Merge pull request #35 from charsleysa/spinlock

Fix TestWorld failing.