Adjusting Model partly done. Added some basic unit tests