Use existed add_params_to_uri instead of add_query
Remove test case for add_query