[COMMENT] Fulfilled task - fixed unit-tests.