Moved ModelTest directory into UnitTest directory