added tasks and tests