Add Geotk 3.21 dependencies.
Add more test suite dependencies.