Removed all threading and tests pass.