Improve code coverage for instance and neighbor introspect

Change-Id: Iffd815e942549b954d1df7d5db3074c10b7833e9