rename macro names for test api keys
remove deprected method; and rename clientid to apiKey