Add service check testing to diagnose this flaky test