Attempt to fix for Python 3. Tests still failing.