Fix tests

Fixes the unit tests, assuming the behavior change is accurate.  Changing to use the REGISTRY endpoint to v2 breaks the integration tests since the latest version of the registry is not deployed.