Renamed the default env variables for tokens and secrets.  And added tests for the methods