Retry executor tests.
Round of cleanup and metrics.