Adjust the test suite for the behavioral changes of pkgdb2 1.21