Updated Testcases to use google_id, removed claimed_id & display_id