Model and Util Unit testing

Merging unit testing for the Model and Util layers.