More tools and tests + shrinkwrap