Improvements to responder strategies, tests for index/collections