Improve code coverage for instance and neighbor introspect

Change-Id: Ia29e7c58ec5f9e47b68d17c215519eac1d42b6c9