Stresstest improvements