Upgrade to the new set of tests