Added some more model tests