Revert @task on methods and renamed task -> tasks
Fix tests