task #633 - all todo fixed and writed tests