Adding classes, tasks and tests