[ADD] Some tests to be done in TODO file