refactor responder, more tests