Added tests for all methods in ModelUtil