Improve code coverage for instance and neighbor introspect

Change-Id: I13913f56414c707fbe6a9d5e97d6c7b36039ae47
Merge "Improve code coverage for instance and neighbor introspect"