Upgrade to phpspec2