Refactor again

Refactored stress tests again so tests are not external