Fixed some scaladoc comments
Model files for unit tests