Fix some of the packages used in the tests.