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

Fixing up neighborhood test/implementations.