Fix tests broken by move to verify_credentials