Add back tests that were reverted in r204203.

They pass again with the fix in r204581.