[MODIF] Updated and passed all unit-tests.