Merge "Cleanup fixed_name logic in test_list_server_filters"