For ENG-5869, drain does indeed need to know when all callbacks have been invoked. Fix test bug