Fixed sanity tests that did not catch ConnectionError