Removed unnecessary model/controller
Fix:Test cases for model
Test cases updated