Cleaning up and ammending client backend error retry tests