Migrate to new expectTerminated()