Eliminated dependency on Boost.Thread in the thread-safe version, fixed a problem with the split-up test files.