6. I'd rather see the cartoon that is happy than the one that is sad.
That is correct in both places.
You may find that some writers use which instead of that in such sentences. Some folks believe that which is OK in essential uses. For clarity, however, it is better to keep the distinction between essential and non-essential that the word that provides. Back to The Test