Better retries, tests incoming