Change e2e bench to test
Add configurable retries
Remove DB timeouts