Fix up neighborhood tests for python3.
Merge branch 'hotfix/0.96a10'