bring test coverage of Model traits to 100%, some fixes while testing