BS-8504 : Comment is not correct when a task is "Done for"

- Fix the added comments
- Fix tests