NMS-6940 add a little play for fetch-checking, also clean up @JUnitCollector