fix task models

[peterghrong]

Description

Task model was bad, now it's less bad.

Fixes # (issue)

Type of change

Please delete options that are not relevant.

• [x] Breaking change (fix or feature that would cause existing functionality to not work as expected)

How Has This Been Tested?

Please describe the tests that you ran to verify your changes.
Provide instructions so we can reproduce.
Please also list any relevant details for your test configuration

• [x] See unit tests

Checklist:

• [x] I have performed a self-review of my own code
• [ ] I have made corresponding changes to the documentation
• [x] My changes generate no new warnings
• [x] I have added tests that prove my fix is effective or that my feature works
• [x] I will rebase before merging

[peterghrong]

mua x