response_map additions and tests