Try to enhance Storm tests