Improve code coverage for instance and neighbor introspect

Change-Id: Ia18d4370c4b9b1e7580d62a3c6b8efb77a5fa754