- Updates to allow some tests to pass with Python 3.  Still more work to do to make all
  tests pass.