adding anon response_map tests and refactor