Fixes bug that meant storm tests weren't running

Sigh, my usual mistake. Didn't add the storm-test to the aggregate target so it wasn't being tested.

Also had some failures without the other sleep/kill in a few runs. With these settings it seems stable.