Fix failing unittests

Fallout from removal of .done and .interrupt.