WIP: Added new unit test file, small changes in model and unit test of model