Use a new StubInstance to avoid requiring the "test" feature (#2509)

Use a new StubInstance to avoid requiring the "test" feature (#2509) #1367