Bug fixed + UnitTests continued 70%