Disruption: use chaos type in test
Disruptions: misc corrections after reviews