adding todos for areas of concern [KFSQA-832]