Revert "Revert "Add support for endurance tests and initial test suite""

This reverts commit 3ec7f8332b28ab2c38ab32a683359d87d3be5af9.
Fix regression caused by endurance tests landing