remove activity_schema from task and fix most tests