Revert to trunk version
Fix to run upgraded tests against trunk