Fix descriptions on test cases and handle connection errors more
gracefully