Update dependencies; sync testing w/ upstream