Added task and target

Fixed problems with unittests