add responders; fix test