Merge "Improve response data of test_routers_client"