Fix test
Stricted update
Throw more informative exception, and make the task list updated too