[KFSQA-855] added a couple of todo comments