Update, broaden test suite dependencies.