Use prod access endpoint first and fall back to the test endpoint whe…

Use prod access endpoint first and fall back to the test endpoint whe… #736