Fix neutral neighbor test
Add ownership tests to map