Improve code coverage for instance and neighbor introspect

Change-Id: I7a59f90cf4d91e2eeee8870ffe3baea8ea797f50