Add some tasks.
Fix existing tests.