Task deleted
Fix test and errors.
Merge branch `rewrite` into `master`.