Fix test suite dependencies