Switch test to use retrying client to avoid some timing issues