Some basic improvements to responder and tests