Update verification of dependency API fallback

This fixes the tests and still verifies fallback. Should be enough to get 1.7.1 out the door, but we should do a clean up of the fallback code to remove the duplication.