No shrinkwrap
Fix up the (migrated) test suite