Add skip-container tests.

Also adding associated example data, and a bug fix.