Disruption refactoring

**DO NOT MERGE**

pr to open the discussion on disruption handling 
Why not just have a shared_ptr in the fixture directly? Why is it a weak_ptr?