Refs #414 - Make issue 414 consider all 1CA tests flaky

Issue #414 (closed) has been updated to consider all the 1CA tests as flaky, and it isn't clear which will be the one that actually fails. This MR updates the retry for the tests to match this.

Additionally, this also updates the timeouts for the tests based on the tests I did last week. I don't think this is the whole solution (it doesn't close the issue), but rather an incremental improvement.