Upgrade to new stubborn and fix some tests