Test fixup

Changing the way shrinkwrap and ls --json work changed a few of the
test fixtures.  Make them pass again.