Refactoring of stress-test

Thanks, I lost the track in all those comments... Should be fixed now