tests: fix up some test changes from the solver optimizations the output of pkgconf is basically functionally equivalent in both cases