Refactor addTask to always expect work last