Fixed most of the bugs
Fixed unit test
Updated unit test