WIP custom supervisor
Add testcases where an unusual failure prevents full recovery