Done fixing test issues, shrinkwrap and publish