Don't retry for non-500 errors.  Also, get tests passing.