Stresstest improvements
Tests passing