Improve code coverage for instance and neighbor introspect

Change-Id: Ic3399d6cc583021b2232c7ef51c947559d40833d