On delete, also attempt to update controller state, in case we
missed a previous update.  Add a test to validate that this works