Fix Unit Testings Modular